X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=1c7df49083385be633d7aa9e1c20a4e1300fed32;hb=refs%2Fheads%2Ffeatures%2FJAL-2068groovyAnnotationWorker;hp=db792e270fd7d6042eac33df4b026f84cc00ad3f;hpb=0e90e35fa87e18e80a340f982110b03c5eccc503;p=jalview.git diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java index db792e2..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,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(); @@ -167,4 +168,9 @@ public class PDBEntry this.chainCode = chainCode; } + @Override + public String toString() + { + return id; + } }