sg might be null if mouse released after coloumns removed

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

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 54924d0..99b8620 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -73,9 +73,11 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
         min = res;\r
         max = res;\r
 \r
-        if(reveal != null && SwingUtilities.isRightMouseButton(evt))\r
+        if (SwingUtilities.isRightMouseButton(evt))\r
+        {\r
+          JPopupMenu pop = new JPopupMenu();\r
+          if (reveal != null)\r
           {\r
-            JPopupMenu pop = new JPopupMenu();\r
             JMenuItem item = new JMenuItem("Reveal");\r
             item.addActionListener(new ActionListener()\r
             {\r
@@ -84,13 +86,13 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                 av.showColumn(reveal[0]);\r
                 reveal = null;\r
                 ap.repaint();\r
-                if(ap.overviewPanel != null)\r
-                    ap.overviewPanel.updateOverviewImage();\r
+                if (ap.overviewPanel != null)\r
+                  ap.overviewPanel.updateOverviewImage();\r
               }\r
             });\r
             pop.add(item);\r
 \r
-            if(av.getColumnSelection().size()>1)\r
+            if (av.getColumnSelection().getHiddenColumns().size() > 1)\r
             {\r
               item = new JMenuItem("Reveal All");\r
               item.addActionListener(new ActionListener()\r
@@ -100,56 +102,66 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
                   av.showAllHiddenColumns();\r
                   reveal = null;\r
                   ap.repaint();\r
-                  if(ap.overviewPanel != null)\r
+                  if (ap.overviewPanel != null)\r
                     ap.overviewPanel.updateOverviewImage();\r
                 }\r
               });\r
               pop.add(item);\r
             }\r
-\r
             pop.show(this, evt.getX(), evt.getY());\r
-\r
           }\r
-        else\r
-      if (av.getColumnSelection().contains(res))\r
-        {\r
-          if( SwingUtilities.isRightMouseButton(evt))\r
+          else if (av.getColumnSelection().contains(res))\r
           {\r
-            JPopupMenu pop = new JPopupMenu();\r
             JMenuItem item = new JMenuItem("Hide Columns");\r
             item.addActionListener(new ActionListener()\r
             {\r
               public void actionPerformed(ActionEvent e)\r
               {\r
                 av.hideColumns(res, res);\r
+                if(av.getSelectionGroup()!=null\r
+                   && av.getSelectionGroup().getSize(false)==av.alignment.getHeight())\r
+                  av.setSelectionGroup(null);\r
+\r
                 ap.repaint();\r
-                if(ap.overviewPanel != null)\r
+                if (ap.overviewPanel != null)\r
                   ap.overviewPanel.updateOverviewImage();\r
               }\r
             });\r
             pop.add(item);\r
             pop.show(this, evt.getX(), evt.getY());\r
-\r
-          }\r
-          else\r
-          {\r
-            av.getColumnSelection().removeElement(res);\r
-            av.setSelectionGroup(null);\r
           }\r
         }\r
-        else\r
+        else // LEFT MOUSE TO SELECT\r
         {\r
-            av.getColumnSelection().addElement(res);\r
-            SequenceGroup sg = new SequenceGroup();\r
+          if (!evt.isControlDown() && !evt.isShiftDown())\r
+          {\r
+            av.getColumnSelection().clear();\r
+          }\r
 \r
-            for (int i = 0; i < av.alignment.getSequences().size(); i++)\r
+          av.getColumnSelection().addElement(res);\r
+          SequenceGroup sg = new SequenceGroup();\r
+          for (int i = 0; i < av.alignment.getSequences().size(); i++)\r
+          {\r
+            sg.addSequence(av.alignment.getSequenceAt(i), false);\r
+          }\r
+\r
+          sg.setStartRes(res);\r
+          sg.setEndRes(res);\r
+          av.setSelectionGroup(sg);\r
+\r
+          if(evt.isShiftDown())\r
+          {\r
+            int min = Math.min(av.getColumnSelection().getMin(), res);\r
+            int max = Math.max(av.getColumnSelection().getMax(), res);\r
+            for (int i = min; i<max; i++)\r
             {\r
-                sg.addSequence(av.alignment.getSequenceAt(i), false);\r
+                av.getColumnSelection().addElement(i);\r
             }\r
+            sg.setStartRes(min);\r
+            sg.setEndRes(max);\r
+          }\r
+\r
 \r
-            sg.setStartRes(res);\r
-            sg.setEndRes(res);\r
-            av.setSelectionGroup(sg);\r
         }\r
 \r
 \r
@@ -184,15 +196,16 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
 \r
         SequenceGroup sg = av.getSelectionGroup();\r
 \r
-        if (res > sg.getStartRes())\r
-        {\r
+        if(sg!=null){\r
+          if (res > sg.getStartRes())\r
+          {\r
             sg.setEndRes(res);\r
-        }\r
-        else if (res < sg.getStartRes())\r
-        {\r
+          }\r
+          else if (res < sg.getStartRes())\r
+          {\r
             sg.setStartRes(res);\r
+          }\r
         }\r
-\r
         stretchingGroup = false;\r
         ap.repaint();\r
     }\r