JAL-793 use default custom export settings for html exports

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

diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index 0050666..d0cef5d 100755 (executable)
--- a/src/jalview/datamodel/PDBEntry.java
+++ b/src/jalview/datamodel/PDBEntry.java
@@ -55,10 +55,7 @@ public class PDBEntry
       return true;
     }
     PDBEntry o = (PDBEntry) obj;
-    return /*
-            * (file == o.file || (file != null && o.file != null && o.file
-            * .equals(file))) &&
-            */
+    return
     (type == o.type || (type != null && o.type != null && o.type
                     .equals(type)))
             && (id == o.id || (id != null && o.id != null && o.id
@@ -69,6 +66,7 @@ public class PDBEntry
             && (properties == o.properties || (properties != null
                     && o.properties != null && properties
                       .equals(o.properties)));
+    
   }
 
   /**
@@ -94,7 +92,7 @@ public class PDBEntry
   {
     this.id = pdbId;
     this.chainCode = chain;
-    this.type = type.toString();
+    this.type = type == null ? null : type.toString();
     this.file = filePath;
   }
 
@@ -125,9 +123,13 @@ public class PDBEntry
     return file;
   }
 
+  public void setType(String t)
+  {
+    this.type = t;
+  }
   public void setType(PDBEntry.Type type)
   {
-    this.type = type.toString();
+    this.type = type == null ? null : type.toString();
   }
 
   public String getType()
@@ -165,4 +167,8 @@ public class PDBEntry
     this.chainCode = chainCode;
   }
 
+  public String toString()
+  {
+    return id;
+  }
 }