# HG changeset patch
# User robcast
# Date 1365018961 -7200
# Node ID 5f7fd411823c029e6ee5a0d083b4c7bcb5669893
# Parent  ce3105f6910a57c45f25264c045f2169fad0441a
some more cleaning.

diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/io/DocuDirent.java
--- a/common/src/main/java/digilib/io/DocuDirent.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/io/DocuDirent.java	Wed Apr 03 21:56:01 2013 +0200
@@ -89,11 +89,6 @@
      */
     public abstract void setMeta(FileMeta fileMeta);
 
-    /**
-     * @return
-     */
-    public abstract boolean isMetaChecked();
-
     /** Comparator using the file name.
      * Compares to a String (for binarySearch)
      * or to another DocuDirent (for sort)
diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/io/DocuDirentImpl.java
--- a/common/src/main/java/digilib/io/DocuDirentImpl.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/io/DocuDirentImpl.java	Wed Apr 03 21:56:01 2013 +0200
@@ -101,13 +101,6 @@
 		this.parent = parent;
 	} 
 	
-	/* (non-Javadoc)
-     * @see digilib.io.DocuDirent#isMetaChecked()
-     */
-	public boolean isMetaChecked() {
-		return meta.isChecked();
-	} 
-	
 	/**
 	 * @return
 	 */
diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/meta/DirMeta.java
--- a/common/src/main/java/digilib/meta/DirMeta.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/meta/DirMeta.java	Wed Apr 03 21:56:01 2013 +0200
@@ -11,14 +11,31 @@
  */
 public interface DirMeta {
 
-    public boolean isChecked();
+    /**
+     * read and store metadata for this directory.
+     * @param dir
+     */
+    public void readMeta(DocuDirectory dir);
 
-    public void readMeta(DocuDirectory docuDirectory);
+    /**
+     * check and process metadata for this directory.
+     * 
+     * @param docuDirectory
+     */
+    public void checkMeta(DocuDirectory dir);
 
-    public void checkMeta(DocuDirectory docuDirectory);
-
+    /**
+     * returns metadata for this directory
+     * 
+     * @return
+     */
     public MetadataMap getDirMeta();
 
+    /**
+     * sets the metadata for this directory.
+     * 
+     * @param dirMeta
+     */
     public void setDirMeta(MetadataMap dirMeta);
 
 }
diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/meta/FileMeta.java
--- a/common/src/main/java/digilib/meta/FileMeta.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/meta/FileMeta.java	Wed Apr 03 21:56:01 2013 +0200
@@ -12,18 +12,31 @@
 public interface FileMeta {
 
     /**
+     * read and store metadata for this file.
+     * 
+     * @param dirent
+     */
+    public void readMeta(DocuDirent file);
+
+    /**
+     * check and process metadata for this file.
+     * 
+     * @param dirent
+     */
+    public void checkMeta(DocuDirent file);
+
+    /**
      * returns a MetadataMap with metadata for this File.
      * 
      * @param file
      * @return
      */
-    void readMeta(DocuDirent dirent);
-
-    MetadataMap getFileMeta();
+    public MetadataMap getFileMeta();
 
-    void setFileMeta(MetadataMap fileMeta);
+    /**
+     * set metadata for this file.
+     * @param fileMeta
+     */
+    public void setFileMeta(MetadataMap fileMeta);
 
-    boolean isChecked();
-
-    void checkMeta(DocuDirent dirent);
 }
diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/meta/IndexMetaAuthLoader.java
--- a/common/src/main/java/digilib/meta/IndexMetaAuthLoader.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/meta/IndexMetaAuthLoader.java	Wed Apr 03 21:56:01 2013 +0200
@@ -317,8 +317,7 @@
             reader = factory.createXMLStreamReader(in);
             // start reading
             tags = new LinkedList<String>();
-            while (readAll()) {
-            }
+            readAll();
         } catch (MalformedURLException e) {
             logger.error("Malformed URL!");
             throw new IOException(e);
diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/meta/IndexMetaDirMeta.java
--- a/common/src/main/java/digilib/meta/IndexMetaDirMeta.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/meta/IndexMetaDirMeta.java	Wed Apr 03 21:56:01 2013 +0200
@@ -156,12 +156,4 @@
         return this.unresolvedFileMeta;
     }
 
-    @Override
-    public boolean isChecked() {
-        return this.metaChecked;
-    }
-
-
-
-
 }
diff -r ce3105f6910a -r 5f7fd411823c common/src/main/java/digilib/meta/IndexMetaFileMeta.java
--- a/common/src/main/java/digilib/meta/IndexMetaFileMeta.java	Wed Apr 03 21:07:57 2013 +0200
+++ b/common/src/main/java/digilib/meta/IndexMetaFileMeta.java	Wed Apr 03 21:56:01 2013 +0200
@@ -98,10 +98,4 @@
         this.fileMeta = fileMeta;
     }
 
-    @Override
-    public boolean isChecked() {
-        // TODO Auto-generated method stub
-        return this.metaChecked;
-    }
-
 }
diff -r ce3105f6910a -r 5f7fd411823c webapp/src/main/webapp/sample-images/p0005.jpg.meta
--- a/webapp/src/main/webapp/sample-images/p0005.jpg.meta	Wed Apr 03 21:07:57 2013 +0200
+++ b/webapp/src/main/webapp/sample-images/p0005.jpg.meta	Wed Apr 03 21:56:01 2013 +0200
@@ -5,12 +5,13 @@
       <original-dpi>370</original-dpi>
     </img>
     <access-conditions>
+      <access type="free"/>
       <copyright resource="digital-image">
-	<owner>
+        <owner>
           <name>Max Planck Institute for the History of Science, Library</name>
           <url>http://www.mpiwg-berlin.mpg.de/</url>
-	</owner>
-	<license type="cc-by-sa"/>
+        </owner>
+        <license type="cc-by-sa"/>
       </copyright>
     </access-conditions>
   </meta>