X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=253586455a9394fbe5dd1e354d481e59178e8972;hb=d423f22792e47dbc800ae220a58677f988971d06;hp=16f88642f3b71e6d37e109e4a3fbc7b26c2736b0;hpb=7bc226b58110fa26d9dbd3f0c78095d06909ffc3;p=jalview.git

diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index 16f8864..2535864 100755
--- a/src/jalview/datamodel/PDBEntry.java
+++ b/src/jalview/datamodel/PDBEntry.java
@@ -1,73 +1,112 @@
-/*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
- * This program 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 2
- * of the License, or (at your option) any later version.
- *
- * This program 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-package jalview.datamodel;
-
-import java.util.*;
-
-public class PDBEntry
-{
-  String file;
-  String type;
-  String id;
-  Hashtable properties;
-
-  public PDBEntry()
-  {}
-
-  public void setFile(String file)
-  {
-    this.file = file;
-  }
-
-  public String getFile()
-  {
-    return file;
-  }
-
-  public void setType(String type)
-  {
-    this.type = type;
-  }
-
-  public String getType()
-  {
-    return type;
-  }
-
-  public void setId(String id)
-  {
-    this.id = id;
-  }
-
-  public String getId()
-  {
-    return id;
-  }
-
-  public void setProperty(Hashtable property)
-  {
-    this.properties = property;
-  }
-
-  public Hashtable getProperty()
-  {
-    return properties;
-  }
-
-}
+/*
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
+ * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * 
+ * 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.
+ * 
+ * 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 <http://www.gnu.org/licenses/>.
+ */
+package jalview.datamodel;
+
+import java.util.*;
+
+public class PDBEntry
+{
+  String file;
+
+  String type;
+
+  String id;
+
+  Hashtable properties;
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see java.lang.Object#equals(java.lang.Object)
+   */
+  public boolean equals(Object obj)
+  {
+    if (obj == null || !(obj instanceof 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)))
+            && (id == o.id || (id != null && o.id != null && o.id
+                    .equalsIgnoreCase(id)))
+            && (properties == o.properties || (properties != null
+                    && o.properties != null && properties
+                    .equals(o.properties)));
+  }
+
+  public PDBEntry()
+  {
+  }
+
+  public PDBEntry(PDBEntry entry)
+  {
+    file = entry.file;
+    type = entry.type;
+    id = entry.id;
+    if (entry.properties != null)
+    {
+      properties = (Hashtable) entry.properties.clone();
+    }
+  }
+
+  public void setFile(String file)
+  {
+    this.file = file;
+  }
+
+  public String getFile()
+  {
+    return file;
+  }
+
+  public void setType(String type)
+  {
+    this.type = type;
+  }
+
+  public String getType()
+  {
+    return type;
+  }
+
+  public void setId(String id)
+  {
+    this.id = id;
+  }
+
+  public String getId()
+  {
+    return id;
+  }
+
+  public void setProperty(Hashtable property)
+  {
+    this.properties = property;
+  }
+
+  public Hashtable getProperty()
+  {
+    return properties;
+  }
+
+}