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
\r
void showGroup()\r
{\r
+ if(groups.size()<1)\r
+ return;\r
+\r
assignedVector = new Vector();\r
if(selectedGroupIndex!=-1)\r
{\r
\r
protected void groupName_actionPerformed(ActionEvent e)\r
{\r
- String reply = JOptionPane.showInputDialog(this, "Enter new group name", "Edit group name", JOptionPane.QUESTION_MESSAGE);\r
+ String reply = JOptionPane.showInternalInputDialog(this, "Enter new group name", "Edit group name", JOptionPane.QUESTION_MESSAGE);\r
if(reply==null)\r
return;\r
\r
\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
{\r
\r
unassignedVector.addElement(assignedVector.elementAt(indices[i]-i));\r
- sg.deleteSequence( (SequenceI)sequenceHash.get( assignedVector.elementAt(indices[i]-i) ));\r
+ SequenceI removeSequence = (SequenceI)sequenceHash.get( assignedVector.elementAt(indices[i]-i) );\r
+ av.getSelection().removeElement( removeSequence );\r
+ sg.deleteSequence( removeSequence );\r
assignedVector.removeElementAt(indices[i]-i);\r
\r
}\r
{\r
String id = (String)enum.nextElement();\r
unassignedVector.addElement( id );\r
- sg.deleteSequence( (SequenceI)sequenceHash.get( id ));\r
+ SequenceI removeSequence = (SequenceI)sequenceHash.get( id );\r
+ av.getSelection().removeElement( removeSequence );\r
+ sg.deleteSequence( removeSequence );\r
}\r
\r
assignedVector.clear();\r