Column hide/show updated

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index f7fc105..876909b 100755 (executable)
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -68,6 +68,7 @@ public class AlignFrame
    */\r
   public AlignFrame(AlignmentI al)\r
   {\r
+\r
     viewport = new AlignViewport(al);\r
 \r
     this.setDropTarget(new java.awt.dnd.DropTarget(this, this));\r
@@ -857,7 +858,7 @@ public class AlignFrame
            for(int i=0; i<hc.size(); i++)\r
            {\r
              int [] region = (int[]) hc.elementAt(i);\r
-             af.viewport.hideColumns(region[0], region[1]+1);\r
+             af.viewport.hideColumns(region[0], region[1]);\r
            }\r
          }\r
 \r

diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 1970181..3ae0a52 100755 (executable)
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1126,12 +1126,9 @@ public class AlignViewport
       if (colSel.size() < 1)\r
         return;\r
 \r
-      while (colSel.size() > 0)\r
-      {\r
-        int column = ( (Integer) colSel.getSelected().firstElement()).intValue();\r
-        colSel.hideColumns(column);\r
-      }\r
+      colSel.hideSelectedColumns();\r
       setSelectionGroup(null);\r
+\r
       hasHiddenColumns = true;\r
     }\r
 \r
@@ -1139,14 +1136,9 @@ public class AlignViewport
     public void hideColumns(int start, int end)\r
     {\r
       if(start==end)\r
-        end++;\r
-\r
-      for(int i=start; i<end; i++)\r
-      {\r
-        colSel.addElement(i);\r
-        colSel.hideColumns(i);\r
-      }\r
-\r
+        colSel.hideColumns(start);\r
+      else\r
+        colSel.hideColumns(start, end);\r
       setSelectionGroup(null);\r
       hasHiddenColumns = true;\r
     }\r
@@ -1171,7 +1163,7 @@ public class AlignViewport
     public void showColumn(int col)\r
     {\r
       colSel.revealHiddenColumns(col);\r
-      if(colSel.size()<1)\r
+      if(colSel.getHiddenColumns()==null)\r
         hasHiddenColumns = false;\r
     }\r
 \r

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 3a19916..a6027aa 100755 (executable)
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -121,7 +121,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {\r
               public void actionPerformed(ActionEvent e)\r
               {\r
-                av.hideColumns(res, res+1);\r
+                av.hideColumns(res, res);\r
                 ap.repaint();\r
                 if(ap.overviewPanel != null)\r
                   ap.overviewPanel.updateOverviewImage();\r