file format enum wip changes

[jalview.git] / src / jalview / datamodel / PDBEntry.java

diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index d0cef5d..243e00c 100755 (executable)
--- a/src/jalview/datamodel/PDBEntry.java
+++ b/src/jalview/datamodel/PDBEntry.java
@@ -34,9 +34,10 @@ public class PDBEntry
 
   public enum Type
   {
-    PDB, FILE
+    PDB, MMCIF, FILE
   }
-  Hashtable properties;
+
+  Hashtable<String, String> properties;
 
   /*
    * (non-Javadoc)
@@ -55,9 +56,8 @@ public class PDBEntry
       return true;
     }
     PDBEntry o = (PDBEntry) obj;
-    return
-    (type == o.type || (type != null && o.type != null && o.type
-                    .equals(type)))
+    return (type == o.type || (type != null && o.type != null && o.type
+            .equals(type)))
             && (id == o.id || (id != null && o.id != null && o.id
                     .equalsIgnoreCase(id)))
             && (chainCode == o.chainCode || (chainCode != null
@@ -66,7 +66,7 @@ public class PDBEntry
             && (properties == o.properties || (properties != null
                     && o.properties != null && properties
                       .equals(o.properties)));
-    
+
   }
 
   /**
@@ -86,7 +86,7 @@ public class PDBEntry
   // this.file = filePath;
   // this.id = pdbId;
   // }
-  
+
   public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
           String filePath)
   {
@@ -127,6 +127,7 @@ public class PDBEntry
   {
     this.type = t;
   }
+
   public void setType(PDBEntry.Type type)
   {
     this.type = type == null ? null : type.toString();
@@ -152,7 +153,7 @@ public class PDBEntry
     this.properties = property;
   }
 
-  public Hashtable getProperty()
+  public Hashtable<String, String> getProperty()
   {
     return properties;
   }
@@ -167,6 +168,7 @@ public class PDBEntry
     this.chainCode = chainCode;
   }
 
+  @Override
   public String toString()
   {
     return id;