setDesktopManager(new)

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

diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index d8c5c93..0cf954b 100755 (executable)
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -4,55 +4,86 @@ import jalview.schemes.*;
 import jalview.analysis.*;\r
 import jalview.datamodel.*;\r
 import java.util.Vector;\r
+import java.awt.*;\r
 \r
 public class SequenceGroup\r
 {\r
   String groupName;\r
-  boolean isSelected;\r
+  Conservation conserve;\r
+  Vector aaFrequency;\r
   boolean displayBoxes;\r
   boolean displayText;\r
   boolean colourText;\r
-  boolean display;\r
-  Conservation conserve;\r
-  Vector aaFrequency;\r
   boolean aaFrequencyValid = false;\r
   public Vector sequences = new Vector();\r
   int width = -1;\r
   public ColourSchemeI cs;\r
   int startRes = 0;\r
   int endRes = 0;\r
+  Color outlineColour = Color.black;\r
 \r
   public SequenceGroup()\r
   {\r
     groupName = "Group";\r
-    this.isSelected = false;\r
     this.displayBoxes = true;\r
     this.displayText = true;\r
     this.colourText = false;\r
-    this.display = true;\r
     cs = null;\r
   }\r
 \r
   public SequenceGroup(String groupName, ColourSchemeI scheme,\r
-                       boolean isSelected,\r
                        boolean displayBoxes, boolean displayText,\r
                        boolean colourText,\r
-                       boolean display,\r
                        int start,\r
                        int end)\r
   {\r
 \r
     this.groupName = groupName;\r
-    this.isSelected = isSelected;\r
     this.displayBoxes = displayBoxes;\r
     this.displayText = displayText;\r
     this.colourText = colourText;\r
-    this.display = display;\r
     this.cs = scheme;\r
     startRes = start;\r
     endRes = end;\r
   }\r
 \r
+  public boolean adjustForRemoveLeft(int col)\r
+  {\r
+    // return value is true if the group still exists\r
+    if(startRes>=col)\r
+      startRes = startRes - col;\r
+    if(endRes>=col)\r
+    {\r
+      endRes = endRes - col;\r
+      if(startRes>endRes)\r
+        startRes = 0;\r
+    }\r
+    else\r
+    {\r
+        // must delete this group!!\r
+        return false;\r
+    }\r
+\r
+    return true;\r
+  }\r
+\r
+  public boolean adjustForRemoveRight(int col)\r
+  {\r
+\r
+    if(startRes>col)\r
+    {\r
+      // delete this group\r
+      return false;\r
+    }\r
+\r
+    if(endRes>=col)\r
+      endRes = col;\r
+\r
+\r
+    return true;\r
+  }\r
+\r
+\r
   public String getName()\r
   {\r
     return groupName;\r
@@ -92,64 +123,65 @@ public class SequenceGroup
     sequences.removeElement(s);\r
   }\r
 \r
-  public void setColourText(boolean state)\r
+\r
+  public int getStartRes()\r
   {\r
-    colourText = state;\r
+    return startRes;\r
   }\r
 \r
-  public boolean getColourText()\r
+  public int getEndRes()\r
   {\r
-    return colourText;\r
+    return endRes;\r
   }\r
 \r
-  public void setDisplayText(boolean state)\r
+  public void setStartRes(int i)\r
   {\r
-    displayText = state;\r
+    startRes = i;\r
   }\r
 \r
-  public boolean getDisplayText()\r
+  public void setEndRes(int i)\r
   {\r
-    return displayText;\r
+    endRes = i;\r
   }\r
 \r
-  public void setDisplayBoxes(boolean state)\r
+  public int getSize()\r
   {\r
-    displayBoxes = state;\r
+    return sequences.size();\r
   }\r
 \r
-  public boolean getDisplayBoxes()\r
+  public SequenceI getSequenceAt(int i)\r
   {\r
-    return displayBoxes;\r
+    return (SequenceI) sequences.elementAt(i);\r
   }\r
 \r
-  public int getStartRes()\r
+  public void setColourText(boolean state)\r
   {\r
-    return startRes;\r
+    colourText = state;\r
   }\r
 \r
-  public int getEndRes()\r
+  public boolean getColourText()\r
   {\r
-    return endRes;\r
+    return colourText;\r
   }\r
 \r
-  public void setStartRes(int i)\r
+  public void setDisplayText(boolean state)\r
   {\r
-    startRes = i;\r
+    displayText = state;\r
   }\r
 \r
-  public void setEndRes(int i)\r
+  public boolean getDisplayText()\r
   {\r
-    endRes = i;\r
+    return displayText;\r
   }\r
 \r
-  public int getSize()\r
+  public void setDisplayBoxes(boolean state)\r
   {\r
-    return sequences.size();\r
+    displayBoxes = state;\r
   }\r
 \r
-  public SequenceI getSequenceAt(int i)\r
+  public boolean getDisplayBoxes()\r
   {\r
-    return (SequenceI) sequences.elementAt(i);\r
+    return displayBoxes;\r
   }\r
 \r
   public Vector getAAFrequency()\r
@@ -174,4 +206,14 @@ public class SequenceGroup
     }\r
     return width;\r
   }\r
+\r
+\r
+  public void setOutlineColour(Color c)\r
+  {\r
+    outlineColour = c;\r
+  }\r
+  public Color getOutlineColour()\r
+  {\r
+    return outlineColour;\r
+  }\r
 }\r