after merge

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

diff --git a/src/jalview/datamodel/SequenceI.java b/src/jalview/datamodel/SequenceI.java
index b7c9197..82d38b4 100755 (executable)
--- a/src/jalview/datamodel/SequenceI.java
+++ b/src/jalview/datamodel/SequenceI.java
@@ -45,6 +45,7 @@ public interface SequenceI
      */\r
     public String getName();\r
 \r
+\r
     /**\r
      * DOCUMENT ME!\r
      *\r
@@ -64,7 +65,7 @@ public interface SequenceI
      *\r
      * @return DOCUMENT ME!\r
      */\r
-    public String getDisplayId();\r
+    public String getDisplayId(boolean jvsuffix);\r
 \r
     /**\r
      * DOCUMENT ME!\r
@@ -224,12 +225,30 @@ public interface SequenceI
      *\r
      * @param id DOCUMENT ME!\r
      */\r
-    public void setPDBId(String id);\r
+    public void setPDBId(Vector ids);\r
 \r
     /**\r
      * DOCUMENT ME!\r
      *\r
      * @return DOCUMENT ME!\r
      */\r
-    public String getPDBId();\r
+    public Vector getPDBId();\r
+\r
+    public void addPDBId(PDBEntry entry);\r
+\r
+    public String getVamsasId();\r
+\r
+    public void setVamsasId(String id);\r
+\r
+    public void setDBRef(Vector dbs);\r
+\r
+    public Vector getDBRef();\r
+\r
+    public void addDBRef(DBRefEntry entry);\r
+\r
+    public void addSequenceFeature(SequenceFeature sf);\r
+\r
+    public void setDatasetSequence(SequenceI seq);\r
+\r
+    public SequenceI getDatasetSequence();\r
 }\r