X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=06790d7cd69c1b7f4f4ffcc186cd97362d5caa04;hb=17e77c3f2949a0729322b4a8d907f3f34b6a9914;hp=eb955d6956c2d1bf4cfa6ed1ee13926203c00e8e;hpb=d62b90cb6effb7b380e5f7d590691dd884b024cf;p=jalview.git diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java index eb955d6..06790d7 100755 --- a/src/jalview/datamodel/PDBEntry.java +++ b/src/jalview/datamodel/PDBEntry.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) - * Copyright (C) $$Year-Rel$$ The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -36,6 +36,7 @@ public class PDBEntry { PDB, 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,8 @@ public class PDBEntry this.chainCode = chainCode; } + public String toString() + { + return id; + } }