X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=568062b790a6bde5af2ea7dce3a8ec9e68d3f9bd;hb=e775f1627590b62ccad7cc5104667d347079497b;hp=c50330b93a5b0700def7f4988f8cdf8eeec38b5e;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git

diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index c50330b..568062b 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,27 +1,32 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
 import java.awt.*;
 import java.awt.event.*;
+
 import javax.swing.*;
 
 import jalview.datamodel.*;
+import jalview.util.MessageManager;
 
 /**
  * DOCUMENT ME!
@@ -70,14 +75,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
     int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
     final int res;
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       x = av.getColumnSelection().adjustForHiddenColumns(x);
     }
 
-    if (x >= av.alignment.getWidth())
+    if (x >= av.getAlignment().getWidth())
     {
-      res = av.alignment.getWidth() - 1;
+      res = av.getAlignment().getWidth() - 1;
     }
     else
     {
@@ -92,7 +97,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       JPopupMenu pop = new JPopupMenu();
       if (reveal != null)
       {
-        JMenuItem item = new JMenuItem("Reveal");
+        JMenuItem item = new JMenuItem(
+                MessageManager.getString("label.reveal"));
         item.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent e)
@@ -110,7 +116,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
         if (av.getColumnSelection().getHiddenColumns().size() > 1)
         {
-          item = new JMenuItem("Reveal All");
+          item = new JMenuItem(
+                  MessageManager.getString("action.reveal_all"));
           item.addActionListener(new ActionListener()
           {
             public void actionPerformed(ActionEvent e)
@@ -130,15 +137,16 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       }
       else if (av.getColumnSelection().contains(res))
       {
-        JMenuItem item = new JMenuItem("Hide Columns");
+        JMenuItem item = new JMenuItem(
+                MessageManager.getString("label.hide_columns"));
         item.addActionListener(new ActionListener()
         {
           public void actionPerformed(ActionEvent e)
           {
             av.hideColumns(res, res);
             if (av.getSelectionGroup() != null
-                    && av.getSelectionGroup().getSize() == av.alignment
-                            .getHeight())
+                    && av.getSelectionGroup().getSize() == av
+                            .getAlignment().getHeight())
             {
               av.setSelectionGroup(null);
             }
@@ -165,7 +173,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       av.getColumnSelection().addElement(res);
       SequenceGroup sg = new SequenceGroup();
       // try to be as quick as possible
-      SequenceI[] iVec = av.alignment.getSequencesArray();
+      SequenceI[] iVec = av.getAlignment().getSequencesArray();
       for (int i = 0; i < iVec.length; i++)
       {
         sg.addSequence(iVec[i], false);
@@ -205,14 +213,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
     int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       res = av.getColumnSelection().adjustForHiddenColumns(res);
     }
 
-    if (res >= av.alignment.getWidth())
+    if (res >= av.getAlignment().getWidth())
     {
-      res = av.alignment.getWidth() - 1;
+      res = av.getAlignment().getWidth() - 1;
     }
 
     if (!stretchingGroup)
@@ -256,14 +264,14 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       res = 0;
     }
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       res = av.getColumnSelection().adjustForHiddenColumns(res);
     }
 
-    if (res >= av.alignment.getWidth())
+    if (res >= av.getAlignment().getWidth())
     {
-      res = av.alignment.getWidth() - 1;
+      res = av.getAlignment().getWidth() - 1;
     }
 
     if (res < min)
@@ -319,7 +327,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
   {
     if (mouseDragging)
     {
-      ap.seqPanel.scrollCanvas(null);
+      ap.getSeqPanel().scrollCanvas(null);
     }
   }
 
@@ -327,7 +335,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
   {
     if (mouseDragging)
     {
-      ap.seqPanel.scrollCanvas(evt);
+      ap.getSeqPanel().scrollCanvas(evt);
     }
   }
 
@@ -337,7 +345,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
   public void mouseMoved(MouseEvent evt)
   {
-    if (!av.hasHiddenColumns)
+    if (!av.hasHiddenColumns())
     {
       return;
     }
@@ -355,7 +363,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       {
         reveal = region;
         ToolTipManager.sharedInstance().registerComponent(this);
-        this.setToolTipText("Reveal Hidden Columns with Right Mouse Button");
+        this.setToolTipText(MessageManager
+                .getString("label.reveal_hidden_columns"));
         break;
       }
       else
@@ -409,7 +418,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       for (int i = 0; i < cs.size(); i++)
       {
         int sel = cs.columnAt(i);
-        if (av.hasHiddenColumns)
+        if (av.hasHiddenColumns())
         {
           if (cs.isVisible(sel))
           {
@@ -473,7 +482,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
       }
     }
 
-    if (av.hasHiddenColumns)
+    if (av.hasHiddenColumns())
     {
       gg.setColor(Color.blue);
       int res;
@@ -503,7 +512,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
 
       if (reveal != null && reveal[0] > startx && reveal[0] < endx)
       {
-        gg.drawString("Reveal Columns", reveal[0] * av.charWidth, 0);
+        gg.drawString(MessageManager.getString("label.reveal_columns"),
+                reveal[0] * av.charWidth, 0);
       }
     }