X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Fmetadata%2FDirectoryMetadata.java;h=600d65c71a1f128cb88a2761a87fc1be31667b7f;hb=891ecca562e87bb5d0ab1e49eea566c15fe91c6d;hp=0dcdf1200a55300c6c39b9db5bc6fc241c9b0372;hpb=0c8606b2b2bee4d93f383653c283da116ad7fdee;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
index 0dcdf12..600d65c 100755
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/DirectoryMetadata.java
@@ -12,11 +12,9 @@ package eu.svjatoslav.meviz.htmlindexer.metadata;
 import eu.svjatoslav.commons.file.FilePathParser;
 import eu.svjatoslav.meviz.htmlindexer.AbstractIndexer;
 import eu.svjatoslav.meviz.htmlindexer.FileSortComparator;
-import eu.svjatoslav.meviz.htmlindexer.ImageFormatError;
 import eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes.*;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 import java.util.*;
 
@@ -27,7 +25,7 @@ public class DirectoryMetadata implements Serializable {
 
     private static final long serialVersionUID = 3526489102725366334L;
 
-    private final HashMap<String, AbstractFile> fileNameToFileMap = new HashMap<String, AbstractFile>();
+    private final HashMap<String, AbstractFile> fileNameToFileMap = new HashMap<>();
 
     public transient boolean changed;
 
@@ -89,13 +87,13 @@ public class DirectoryMetadata implements Serializable {
         return new GeneralFile(parentDirectory, fileName);
     }
 
-    public AbstractFile getFile(final String fileName) {
+    private AbstractFile getFile(final String fileName) {
         return fileNameToFileMap.get(fileName);
     }
 
     public Collection<AbstractFile> getFiles() {
 
-        final ArrayList<AbstractFile> files = new ArrayList<AbstractFile>(
+        final ArrayList<AbstractFile> files = new ArrayList<>(
                 fileNameToFileMap.values());
 
         Collections.sort(files, new FileSortComparator());
@@ -112,13 +110,12 @@ public class DirectoryMetadata implements Serializable {
         return mevizSpecialFile.getFileContent();
     }
 
-    public Dimension getImageDimensions(final String fileName)
-            throws IOException, ImageFormatError {
+    public Dimension getImageDimensions(final String fileName) {
 
         return ((Picture) getFile(fileName)).getDimensions();
     }
 
-    public AbstractFile registerFile(final File parentDirectory, final File file)
+    private AbstractFile registerFile(final File parentDirectory, final File file)
             throws Exception {
 
         final String fileName = file.getName();
@@ -135,11 +132,10 @@ public class DirectoryMetadata implements Serializable {
 
     public void removeUnusedMetadataEntries() {
 
-        for (final String key : new HashSet<String>(fileNameToFileMap.keySet()))
-            if (!fileNameToFileMap.get(key).isMetaInfoVerified()) {
-                fileNameToFileMap.remove(key);
-                changed = true;
-            }
+        new HashSet<>(fileNameToFileMap.keySet()).stream().filter(key -> !fileNameToFileMap.get(key).isMetaInfoVerified()).forEach(key -> {
+            fileNameToFileMap.remove(key);
+            changed = true;
+        });
 
     }
 }