dont draw first block if colour is null

[jalview.git] / src / jalview / gui / GroupEditor.java

diff --git a/src/jalview/gui/GroupEditor.java b/src/jalview/gui/GroupEditor.java
index 5b6df2b..e3c49d6 100755 (executable)
--- a/src/jalview/gui/GroupEditor.java
+++ b/src/jalview/gui/GroupEditor.java
@@ -29,8 +29,11 @@ public class GroupEditor extends GGroupEditor
     for (int i=0; i < ColourProperties.getColourSchemeNames().size(); i++)\r
        colourCombo.addItem(ColourProperties.getColourSchemeNames().elementAt(i));\r
 \r
-    showGroup();\r
-    updateGroupcombo();\r
+     if(groups.size()>0)\r
+     {\r
+       showGroup();\r
+       updateGroupcombo();\r
+     }\r
 \r
     assignedList.addMouseListener( new MouseAdapter()\r
     {\r
@@ -111,6 +114,9 @@ public class GroupEditor extends GGroupEditor
 \r
   void showGroup()\r
   {\r
+    if(groups.size()<1)\r
+       return;\r
+\r
     assignedVector = new Vector();\r
     if(selectedGroupIndex!=-1)\r
     {\r
@@ -155,6 +161,9 @@ public class GroupEditor extends GGroupEditor
 \r
   protected void colourCombo_actionPerformed(ActionEvent e)\r
   {\r
+     if(groups.size()<1)\r
+       return;\r
+\r
      SequenceGroup sg = (SequenceGroup)groups.elementAt(selectedGroupIndex);\r
 \r
      sg.cs = ColourSchemeFactory.get( (String)colourCombo.getSelectedItem() );\r
@@ -189,10 +198,10 @@ public class GroupEditor extends GGroupEditor
       return;\r
 \r
     SequenceGroup sg = (SequenceGroup)groups.elementAt(selectedGroupIndex);\r
-    Selection sel = av.getSelection();\r
-    for(int i=0; i<sel.size(); i++)\r
+\r
+    for(int i=0; i<av.getSelectionGroup().getSize(); i++)\r
     {\r
-      int index = unassignedVector.indexOf( sel.sequenceAt(i).getDisplayId() );\r
+      int index = unassignedVector.indexOf( av.getSelectionGroup().getSequenceAt(i).getDisplayId() );\r
       if(index!=-1)\r
       {\r
         sg.addSequence( (SequenceI) sequenceHash.get( unassignedVector.elementAt(index) ));\r
@@ -258,7 +267,7 @@ public class GroupEditor extends GGroupEditor
 \r
       unassignedVector.addElement(assignedVector.elementAt(indices[i]-i));\r
       SequenceI removeSequence = (SequenceI)sequenceHash.get( assignedVector.elementAt(indices[i]-i) );\r
-      av.getSelection().removeElement( removeSequence );\r
+      av.getSelectionGroup().deleteSequence( removeSequence );\r
       sg.deleteSequence( removeSequence );\r
       assignedVector.removeElementAt(indices[i]-i);\r
 \r
@@ -279,7 +288,7 @@ public class GroupEditor extends GGroupEditor
       String id = (String)enum.nextElement();\r
       unassignedVector.addElement( id );\r
       SequenceI removeSequence = (SequenceI)sequenceHash.get( id );\r
-      av.getSelection().removeElement( removeSequence );\r
+      av.getSelectionGroup().deleteSequence( removeSequence );\r
       sg.deleteSequence( removeSequence );\r
     }\r
 \r
@@ -296,11 +305,11 @@ public class GroupEditor extends GGroupEditor
    groups.add(\r
       new SequenceGroup("Group "+(groups.size()+1),\r
                         cs,\r
-                        false,\r
                         boxesCheck.isSelected(),\r
                         textCheck.isSelected(),\r
                         colourTextCheck.isSelected(),\r
-                        true) );\r
+                        0, av.alignment.getWidth()\r
+                        ) );\r
 \r
    updateGroupcombo();\r
    groupsCombo.setSelectedIndex( groupsCombo.getItemCount()-1 );\r