From c9341214ff17ad97ad65c79335187a1b8ca17ca2 Mon Sep 17 00:00:00 2001
From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 26 Jul 2006 10:11:56 +0000
Subject: [PATCH] Column hide/show updated

---
 src/jalview/gui/AlignFrame.java    |    3 ++-
 src/jalview/gui/AlignViewport.java |   20 ++++++--------------
 src/jalview/gui/ScalePanel.java    |    2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java
index f7fc105..876909b 100755
--- a/src/jalview/gui/AlignFrame.java
+++ b/src/jalview/gui/AlignFrame.java
@@ -68,6 +68,7 @@ public class AlignFrame
    */
   public AlignFrame(AlignmentI al)
   {
+
     viewport = new AlignViewport(al);
 
     this.setDropTarget(new java.awt.dnd.DropTarget(this, this));
@@ -857,7 +858,7 @@ public class AlignFrame
            for(int i=0; i<hc.size(); i++)
            {
              int [] region = (int[]) hc.elementAt(i);
-             af.viewport.hideColumns(region[0], region[1]+1);
+             af.viewport.hideColumns(region[0], region[1]);
            }
          }
 
diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java
index 1970181..3ae0a52 100755
--- a/src/jalview/gui/AlignViewport.java
+++ b/src/jalview/gui/AlignViewport.java
@@ -1126,12 +1126,9 @@ public class AlignViewport
       if (colSel.size() < 1)
         return;
 
-      while (colSel.size() > 0)
-      {
-        int column = ( (Integer) colSel.getSelected().firstElement()).intValue();
-        colSel.hideColumns(column);
-      }
+      colSel.hideSelectedColumns();
       setSelectionGroup(null);
+
       hasHiddenColumns = true;
     }
 
@@ -1139,14 +1136,9 @@ public class AlignViewport
     public void hideColumns(int start, int end)
     {
       if(start==end)
-        end++;
-
-      for(int i=start; i<end; i++)
-      {
-        colSel.addElement(i);
-        colSel.hideColumns(i);
-      }
-
+        colSel.hideColumns(start);
+      else
+        colSel.hideColumns(start, end);
       setSelectionGroup(null);
       hasHiddenColumns = true;
     }
@@ -1171,7 +1163,7 @@ public class AlignViewport
     public void showColumn(int col)
     {
       colSel.revealHiddenColumns(col);
-      if(colSel.size()<1)
+      if(colSel.getHiddenColumns()==null)
         hasHiddenColumns = false;
     }
 
diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 3a19916..a6027aa 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -121,7 +121,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener, MouseList
             {
               public void actionPerformed(ActionEvent e)
               {
-                av.hideColumns(res, res+1);
+                av.hideColumns(res, res);
                 ap.repaint();
                 if(ap.overviewPanel != null)
                   ap.overviewPanel.updateOverviewImage();
-- 
1.7.10.2