drawableSequence removed

diff --git a/src/MCview/PDBChain.java b/src/MCview/PDBChain.java
index 6a72786..15de7c3 100755 (executable)
--- a/src/MCview/PDBChain.java
+++ b/src/MCview/PDBChain.java
@@ -18,7 +18,6 @@ package MCview;
 \r
 import jalview.datamodel.*;\r
 import jalview.schemes.ResidueProperties;\r
-import jalview.gui.*;\r
 \r
 import java.awt.*;\r
 import java.util.*;\r
@@ -210,7 +209,7 @@ public class PDBChain {
   }\r
 \r
 \r
-  public void colourBySequence(DrawableSequence seq) {\r
+  public void colourBySequence(Sequence seq) {\r
 \r
 //    for (int i = 0; i < bonds.size(); i++) {\r
 //      Bond tmp = (Bond)bonds.elementAt(i);\r

diff --git a/src/MCview/PDBfile.java b/src/MCview/PDBfile.java
index 7e46b2e..1aa5cac 100755 (executable)
--- a/src/MCview/PDBfile.java
+++ b/src/MCview/PDBfile.java
@@ -1,6 +1,6 @@
 package MCview;\r
 \r
-import jalview.gui.*;\r
+import jalview.datamodel.*;\r
 import java.io.*;\r
 import java.net.*;\r
 import java.util.*;\r
@@ -117,7 +117,7 @@ public class PDBfile extends jalview.io.FileParse {
     }\r
   }\r
 \r
-  public void colourBySequence(DrawableSequence seq) {\r
+  public void colourBySequence(Sequence seq) {\r
 //SMJS TODO\r
 //    int max = seq.maxchain;\r
 //    if (seq.maxchain != -1) {\r

diff --git a/src/jalview/analysis/Conservation.java b/src/jalview/analysis/Conservation.java
index eed6d0a..c5ddd0f 100755 (executable)
--- a/src/jalview/analysis/Conservation.java
+++ b/src/jalview/analysis/Conservation.java
@@ -32,7 +32,7 @@ public class Conservation {
 \r
   String consString = "";\r
 \r
-  DrawableSequence consSequence;\r
+  Sequence consSequence;\r
   Hashtable        propHash;\r
   int              threshold;\r
 \r
@@ -182,10 +182,10 @@ public class Conservation {
       }\r
     }\r
 \r
-    consSequence = new DrawableSequence(name,consString,start,end);\r
+    consSequence = new Sequence(name,consString,start,end);\r
   }\r
 \r
-  public jalview.gui.DrawableSequence getConsSequence() {\r
+  public Sequence getConsSequence() {\r
     return consSequence;\r
   }\r
 \r