X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fmeviz%2Fhtmlindexer%2Fmetadata%2FfileTypes%2FAbstractFile.java;h=0a89b40dcad7bb3bc06d38af1876244304d64297;hb=8b0fa37543a8ccd5e37d7e16f31b449f8f5440b7;hp=9c35a32308b078186145c289c821bf0fddab4722;hpb=1b742640af99284aae1cd10c259254137316ba7c;p=meviz.git

diff --git a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/AbstractFile.java b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/AbstractFile.java
index 9c35a32..0a89b40 100644
--- a/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/AbstractFile.java
+++ b/src/main/java/eu/svjatoslav/meviz/htmlindexer/metadata/fileTypes/AbstractFile.java
@@ -3,7 +3,6 @@ package eu.svjatoslav.meviz.htmlindexer.metadata.fileTypes;
 import eu.svjatoslav.commons.file.FilePathParser;
 
 import java.io.File;
-import java.io.IOException;
 import java.io.Serializable;
 
 public abstract class AbstractFile implements Serializable {
@@ -20,23 +19,23 @@ public abstract class AbstractFile implements Serializable {
      */
     private long fileLength = -1;
 
-    private transient boolean metaInfoVerified;
+    private transient boolean metadataVerified;
 
-    public AbstractFile(final File parentDirectory, final String fileName)
+    AbstractFile(final File parentDirectory, final String fileName)
             throws Exception {
         this.fileName = fileName;
-        ensureFileMetainfoIsUpToDate(parentDirectory);
+        ensureFileMetadataIsUpToDate(parentDirectory);
     }
 
     /**
      * @return <code>true</code> if file metadata was updated.
      */
-    public boolean ensureFileMetainfoIsUpToDate(final File parentDirectory)
+    public boolean ensureFileMetadataIsUpToDate(final File parentDirectory)
             throws Exception {
-        if (!isMetainfoUpToDate(parentDirectory)) {
+        if (!isMetadataUpToDate(parentDirectory)) {
             fileLength = getFile(parentDirectory).length();
-            updateFileMetainfo(parentDirectory);
-            metaInfoVerified = true;
+            updateFileMetadata(parentDirectory);
+            metadataVerified = true;
             return true;
         }
         return false;
@@ -46,7 +45,7 @@ public abstract class AbstractFile implements Serializable {
         return getFile(parentDirectory).exists();
     }
 
-    public File getFile(final File parentDirectory) {
+    File getFile(final File parentDirectory) {
         return new File(parentDirectory.getAbsolutePath(), fileName);
     }
 
@@ -58,10 +57,9 @@ public abstract class AbstractFile implements Serializable {
         return fileLength;
     }
 
-    private boolean isMetainfoUpToDate(final java.io.File parentDirectory)
-            throws IOException {
+    private boolean isMetadataUpToDate(final java.io.File parentDirectory) {
 
-        if (metaInfoVerified)
+        if (metadataVerified)
             return true;
 
         final File file = getFile(parentDirectory);
@@ -78,15 +76,14 @@ public abstract class AbstractFile implements Serializable {
         if (file.length() != fileLength)
             return false;
 
-        metaInfoVerified = true;
+        metadataVerified = true;
         return true;
     }
 
-    public boolean isMetaInfoVerified() {
-        return metaInfoVerified;
+    public boolean isMetadataVerified() {
+        return metadataVerified;
     }
 
-    protected abstract void updateFileMetainfo(final File parentDirectory)
-            throws Exception;
+    protected abstract void updateFileMetadata(final File parentDirectory) throws Exception;
 
 }