name update for group autoannotation and consensus display settings

[jalview.git] / src / jalview / datamodel / PDBEntry.java

diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index 7cd6a80..cbc9bb6 100755 (executable)
--- a/src/jalview/datamodel/PDBEntry.java
+++ b/src/jalview/datamodel/PDBEntry.java
@@ -1,17 +1,17 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
- *
+ * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
+ * Copyright (C) 2009 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
@@ -23,21 +23,53 @@ 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) {
+  {
+  }
+
+  public PDBEntry(PDBEntry entry)
+  {
     file = entry.file;
     type = entry.type;
     id = entry.id;
-    if (entry.properties!=null)
+    if (entry.properties != null)
     {
       properties = (Hashtable) entry.properties.clone();
     }
   }
+
   public void setFile(String file)
   {
     this.file = file;