X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=3627d6d9bf02d6c84524e4eef74650b9f28e65a2;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=7b30813dd61f10a6a5aadbc34690197b7dfe24fa;hpb=ab43013b7e357b84b4abade0dba949668dfb2a0e;p=jalview.git diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java index 7b30813..3627d6d 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 2.8.2b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,7 +20,7 @@ */ package jalview.datamodel; -import java.util.*; +import java.util.Hashtable; public class PDBEntry { @@ -37,6 +37,7 @@ public class PDBEntry * * @see java.lang.Object#equals(java.lang.Object) */ + @Override public boolean equals(Object obj) { if (obj == null || !(obj instanceof PDBEntry)) @@ -44,7 +45,9 @@ public class PDBEntry return false; } if (obj == this) + { return true; + } PDBEntry o = (PDBEntry) obj; return (file == o.file || (file != null && o.file != null && o.file .equals(file))) @@ -57,10 +60,29 @@ public class PDBEntry .equals(o.properties))); } + /** + * Default constructor + */ public PDBEntry() { } + /** + * Constructor given file path and PDB id. + * + * @param filePath + */ + public PDBEntry(String filePath, String pdbId) + { + this.file = filePath; + this.id = pdbId; + } + + /** + * Copy constructor. + * + * @param entry + */ public PDBEntry(PDBEntry entry) { file = entry.file;