X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=1c7df49083385be633d7aa9e1c20a4e1300fed32;hb=64b79e3758bd98db1664c47205f6570b2d689ba9;hp=eb955d6956c2d1bf4cfa6ed1ee13926203c00e8e;hpb=d62b90cb6effb7b380e5f7d590691dd884b024cf;p=jalview.git

diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index eb955d6..1c7df49 100755
--- a/src/jalview/datamodel/PDBEntry.java
+++ b/src/jalview/datamodel/PDBEntry.java
@@ -34,8 +34,9 @@ public class PDBEntry
 
   public enum Type
   {
-    PDB, FILE
+    PDB, MMCIF, FILE
   }
+
   Hashtable properties;
 
   /*
@@ -55,12 +56,8 @@ public class PDBEntry
       return true;
     }
     PDBEntry o = (PDBEntry) obj;
-    return /*
-            * (file == o.file || (file != null && o.file != null && o.file
-            * .equals(file))) &&
-            */
-    (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
@@ -69,6 +66,7 @@ public class PDBEntry
             && (properties == o.properties || (properties != null
                     && o.properties != null && properties
                       .equals(o.properties)));
+
   }
 
   /**
@@ -88,13 +86,13 @@ public class PDBEntry
   // this.file = filePath;
   // this.id = pdbId;
   // }
-  
+
   public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
           String filePath)
   {
     this.id = pdbId;
     this.chainCode = chain;
-    this.type = type.toString();
+    this.type = type == null ? null : type.toString();
     this.file = filePath;
   }
 
@@ -129,9 +127,10 @@ public class PDBEntry
   {
     this.type = t;
   }
+
   public void setType(PDBEntry.Type type)
   {
-    this.type = type.toString();
+    this.type = type == null ? null : type.toString();
   }
 
   public String getType()
@@ -169,4 +168,9 @@ public class PDBEntry
     this.chainCode = chainCode;
   }
 
+  @Override
+  public String toString()
+  {
+    return id;
+  }
 }