X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=589bc7baf80f9151cd7780e747f1fd5347154b61;hb=55f7d3897490cfa3d997d28194fb9a458f00f41b;hp=7f6e77a655bca8598d7e5537ba6ee2a732b6686b;hpb=865a855a4ca87eadb3e5ff284ed32ed307d9c34b;p=jalview.git
diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index 7f6e77a..589bc7b 100755
--- a/src/jalview/datamodel/PDBEntry.java
+++ b/src/jalview/datamodel/PDBEntry.java
@@ -1,32 +1,41 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
- * 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.
*
* Jalview is free software: you can redistribute it and/or
* modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
*
* Jalview is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty
* of MERCHANTABILITY or FITNESS FOR A PARTICULAR
* PURPOSE. See the GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.datamodel;
-import java.util.*;
+import java.util.Hashtable;
public class PDBEntry
{
- String file;
+ private String file;
- String type;
+ private String type;
- String id;
+ private String id;
+
+ private String chainCode;
+
+ public enum Type
+ {
+ PDB, FILE
+ }
Hashtable properties;
@@ -35,6 +44,7 @@ public class PDBEntry
*
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object obj)
{
if (obj == null || !(obj instanceof PDBEntry))
@@ -42,28 +52,61 @@ 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)))
- && (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
+ && o.chainCode != null && o.chainCode
+ .equalsIgnoreCase(chainCode)))
&& (properties == o.properties || (properties != null
&& o.properties != null && properties
.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;
+ // }
+
+ public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
+ String filePath)
+ {
+ this.id = pdbId;
+ this.chainCode = chain;
+ this.type = type == null ? null : type.toString();
+ this.file = filePath;
+ }
+
+ /**
+ * Copy constructor.
+ *
+ * @param entry
+ */
public PDBEntry(PDBEntry entry)
{
file = entry.file;
type = entry.type;
id = entry.id;
+ chainCode = entry.chainCode;
if (entry.properties != null)
{
properties = (Hashtable) entry.properties.clone();
@@ -80,9 +123,14 @@ public class PDBEntry
return file;
}
- public void setType(String type)
+ public void setType(String t)
+ {
+ this.type = t;
+ }
+
+ public void setType(PDBEntry.Type type)
{
- this.type = type;
+ this.type = type == null ? null : type.toString();
}
public String getType()
@@ -110,4 +158,18 @@ public class PDBEntry
return properties;
}
+ public String getChainCode()
+ {
+ return chainCode;
+ }
+
+ public void setChainCode(String chainCode)
+ {
+ this.chainCode = chainCode;
+ }
+
+ public String toString()
+ {
+ return id;
+ }
}