git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
system.exit or destroy if applet or app
[jalview.git]
/
src
/
jalview
/
gui
/
GroupEditor.java
diff --git
a/src/jalview/gui/GroupEditor.java
b/src/jalview/gui/GroupEditor.java
index
3c58df3
..
3ee186b
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
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
assignedList.addMouseListener( new MouseAdapter()
\r
{
\r
@@
-111,6
+114,9
@@
public class GroupEditor extends GGroupEditor
\r
void showGroup()
\r
{
\r
\r
void showGroup()
\r
{
\r
+ if(groups.size()<1)
\r
+ return;
\r
+
\r
assignedVector = new Vector();
\r
if(selectedGroupIndex!=-1)
\r
{
\r
assignedVector = new Vector();
\r
if(selectedGroupIndex!=-1)
\r
{
\r
@@
-144,7
+150,7
@@
public class GroupEditor extends GGroupEditor
\r
protected void groupName_actionPerformed(ActionEvent e)
\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
if(reply==null)
\r
return;
\r
\r
@@
-155,6
+161,9
@@
public class GroupEditor extends GGroupEditor
\r
protected void colourCombo_actionPerformed(ActionEvent e)
\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
SequenceGroup sg = (SequenceGroup)groups.elementAt(selectedGroupIndex);
\r
\r
sg.cs = ColourSchemeFactory.get( (String)colourCombo.getSelectedItem() );
\r
@@
-257,7
+266,9
@@
public class GroupEditor extends GGroupEditor
{
\r
\r
unassignedVector.addElement(assignedVector.elementAt(indices[i]-i));
\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
assignedVector.removeElementAt(indices[i]-i);
\r
\r
}
\r
@@
-276,7
+287,9
@@
public class GroupEditor extends GGroupEditor
{
\r
String id = (String)enum.nextElement();
\r
unassignedVector.addElement( id );
\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
}
\r
\r
assignedVector.clear();
\r
@@
-292,11
+305,11
@@
public class GroupEditor extends GGroupEditor
groups.add(
\r
new SequenceGroup("Group "+(groups.size()+1),
\r
cs,
\r
groups.add(
\r
new SequenceGroup("Group "+(groups.size()+1),
\r
cs,
\r
- false,
\r
boxesCheck.isSelected(),
\r
textCheck.isSelected(),
\r
colourTextCheck.isSelected(),
\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
\r
updateGroupcombo();
\r
groupsCombo.setSelectedIndex( groupsCombo.getItemCount()-1 );
\r