returns color.white if the underlying colourscheme is null

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

diff --git a/src/jalview/gui/IdPanel.java b/src/jalview/gui/IdPanel.java
index 14f60d5..939a65e 100755 (executable)
--- a/src/jalview/gui/IdPanel.java
+++ b/src/jalview/gui/IdPanel.java
@@ -33,7 +33,8 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
   public void mouseMoved(MouseEvent e) {}\r
 \r
   public void selectSeqs(int start, int end) {\r
-     if (end < start) {\r
+     if (end < start)\r
+     {\r
        int tmp = start;\r
        start = end;\r
        end   = tmp;\r
@@ -53,7 +54,8 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
          if(selectedSequenceGroup==null)\r
          {\r
            selectedSequenceGroup = new SequenceGroup();\r
-           av.alignment.addGroup( selectedSequenceGroup );\r
+           av.setRubberbandGroup( selectedSequenceGroup );\r
+          // av.alignment.addGroup( selectedSequenceGroup );\r
            selectedSequenceGroup.setStartRes(0);\r
            selectedSequenceGroup.setEndRes( pickedSeq.getSequence().length());\r
          }\r
@@ -73,9 +75,6 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
     int y = e.getY();\r
     int seq = av.getIndex(y);\r
 \r
-\r
-\r
-\r
     if (seq < lastid)\r
       selectSeqs(lastid - 1, seq);\r
     else if (seq > lastid)\r
@@ -111,35 +110,34 @@ public class IdPanel extends JPanel implements MouseListener, MouseMotionListene
     int y = e.getY();\r
     int seq = av.getIndex(y);\r
 \r
+    if (javax.swing.SwingUtilities.isRightMouseButton(e))\r
+    {\r
+      jalview.gui.PopupMenu pop = new jalview.gui.PopupMenu(alignPanel,\r
+          av.getAlignment().getSequenceAt(seq));\r
+      pop.show(this, e.getX(), y);\r
+      return;\r
+    }\r
+\r
+\r
+\r
+    if(av.getRubberbandGroup()!=null && (av.getRubberbandGroup().getSize() == av.getSelection().size()))\r
+          selectedSequenceGroup = av.getRubberbandGroup();\r
+\r
+    if (selectedSequenceGroup == null)\r
+    {\r
+      selectedSequenceGroup = new SequenceGroup();\r
+      av.setRubberbandGroup(selectedSequenceGroup);\r
+    }\r
+\r
+    selectedSequenceGroup.setStartRes(0);\r
+    selectedSequenceGroup.setEndRes(av.getAlignment().getWidth() - 1);\r
+\r
+    if (seq != -1)\r
+      selectSeqs(seq, seq);\r
+\r
+    lastid = seq;\r
+\r
 \r
-      if( javax.swing.SwingUtilities.isRightMouseButton(e))\r
-      {\r
-        String id = av.getAlignment().getSequenceAt(seq).getName();\r
-        String s = (String)JOptionPane.showInternalInputDialog(\r
-                    this,\r
-                    "Edit sequence name",\r
-                    "Edit sequence name",\r
-                    JOptionPane.PLAIN_MESSAGE,\r
-                    null,\r
-                    null,\r
-                    id);\r
-\r
-        if(s!=null)\r
-        {\r
-          av.getAlignment().getSequenceAt(seq).setName(s);\r
-          alignPanel.RefreshPanels();\r
-        }\r
-\r
-      }\r
-      else\r
-      {\r
-        selectedSequenceGroup =  av.alignment.findGroup(seq);\r
-\r
-        if (seq != -1)\r
-          selectSeqs(seq,seq);\r
-\r
-        lastid = seq;\r
-      }\r
     return;\r
   }\r
 \r