X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FPDBEntry.java;h=1c7df49083385be633d7aa9e1c20a4e1300fed32;hb=a3b6803932b6b0ce73a44982bc58c56b7b4def4b;hp=1cf9cd7258ed516f09960a22881eaa12333e5fe5;hpb=31f1b88951cc5ff3aea7ae0bc1a9d8fbdd264ea3;p=jalview.git

diff --git a/src/jalview/datamodel/PDBEntry.java b/src/jalview/datamodel/PDBEntry.java
index 1cf9cd7..1c7df49 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.2)
- * 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.
  * 
@@ -24,11 +24,18 @@ 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, MMCIF, FILE
+  }
 
   Hashtable properties;
 
@@ -49,15 +56,17 @@ 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
+                    && o.chainCode != null && o.chainCode
+                      .equalsIgnoreCase(chainCode)))
             && (properties == o.properties || (properties != null
                     && o.properties != null && properties
                       .equals(o.properties)));
+
   }
 
   /**
@@ -72,12 +81,21 @@ public class PDBEntry
    * 
    * @param filePath
    */
-  public PDBEntry(String filePath, String pdbId)
+  // public PDBEntry(String filePath, String pdbId)
+  // {
+  // this.file = filePath;
+  // this.id = pdbId;
+  // }
+
+  public PDBEntry(String pdbId, String chain, PDBEntry.Type type,
+          String filePath)
   {
-    this.file = filePath;
     this.id = pdbId;
+    this.chainCode = chain;
+    this.type = type == null ? null : type.toString();
+    this.file = filePath;
   }
-  
+
   /**
    * Copy constructor.
    * 
@@ -88,6 +106,7 @@ public class PDBEntry
     file = entry.file;
     type = entry.type;
     id = entry.id;
+    chainCode = entry.chainCode;
     if (entry.properties != null)
     {
       properties = (Hashtable) entry.properties.clone();
@@ -104,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()
@@ -134,4 +158,19 @@ public class PDBEntry
     return properties;
   }
 
+  public String getChainCode()
+  {
+    return chainCode;
+  }
+
+  public void setChainCode(String chainCode)
+  {
+    this.chainCode = chainCode;
+  }
+
+  @Override
+  public String toString()
+  {
+    return id;
+  }
 }