X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FScalePanel.java;h=6123065ae2c42f7f44c547bda2288cabd85807ef;hb=ab43013b7e357b84b4abade0dba949668dfb2a0e;hp=097188252fcdafad51516f2db58ebcd42034ab6f;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git
diff --git a/src/jalview/appletgui/ScalePanel.java b/src/jalview/appletgui/ScalePanel.java
index 0971882..6123065 100755
--- a/src/jalview/appletgui/ScalePanel.java
+++ b/src/jalview/appletgui/ScalePanel.java
@@ -1,19 +1,22 @@
/*
- * 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.2b1)
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.appletgui;
@@ -21,6 +24,7 @@ import java.awt.*;
import java.awt.event.*;
import jalview.datamodel.*;
+import jalview.util.MessageManager;
public class ScalePanel extends Panel implements MouseMotionListener,
MouseListener
@@ -60,7 +64,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
int x = (evt.getX() / av.getCharWidth()) + av.getStartRes();
final int res;
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(x);
}
@@ -76,7 +80,8 @@ public class ScalePanel extends Panel implements MouseMotionListener,
PopupMenu pop = new PopupMenu();
if (reveal != null)
{
- MenuItem item = new MenuItem("Reveal");
+ MenuItem item = new MenuItem(
+ MessageManager.getString("label.reveal"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -94,7 +99,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
if (av.getColumnSelection().getHiddenColumns().size() > 1)
{
- item = new MenuItem("Reveal All");
+ item = new MenuItem(MessageManager.getString("action.reveal_all"));
item.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
@@ -115,15 +120,16 @@ public class ScalePanel extends Panel implements MouseMotionListener,
}
else if (av.getColumnSelection().contains(res))
{
- MenuItem item = new MenuItem("Hide Columns");
+ MenuItem item = new MenuItem(
+ 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);
}
@@ -150,9 +156,9 @@ public class ScalePanel extends Panel implements MouseMotionListener,
av.getColumnSelection().addElement(res);
SequenceGroup sg = new SequenceGroup();
- for (int i = 0; i < av.alignment.getSequences().size(); i++)
+ for (int i = 0; i < av.getAlignment().getSequences().size(); i++)
{
- sg.addSequence(av.alignment.getSequenceAt(i), false);
+ sg.addSequence(av.getAlignment().getSequenceAt(i), false);
}
sg.setStartRes(res);
@@ -173,6 +179,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
}
ap.paintAlignment(true);
+ av.sendSelection();
}
public void mouseReleased(MouseEvent evt)
@@ -181,12 +188,12 @@ public class ScalePanel extends Panel implements MouseMotionListener,
int res = (evt.getX() / av.getCharWidth()) + av.getStartRes();
- if (res > av.alignment.getWidth())
+ if (res > av.getAlignment().getWidth())
{
- res = av.alignment.getWidth() - 1;
+ res = av.getAlignment().getWidth() - 1;
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
res = av.getColumnSelection().adjustForHiddenColumns(res);
}
@@ -211,6 +218,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
stretchingGroup = false;
ap.paintAlignment(false);
+ av.sendSelection();
}
public void mouseDragged(MouseEvent evt)
@@ -223,14 +231,14 @@ public class ScalePanel extends Panel 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)
@@ -305,7 +313,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
public void mouseMoved(MouseEvent evt)
{
- if (!av.hasHiddenColumns)
+ if (!av.hasHiddenColumns())
{
return;
}
@@ -358,7 +366,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
for (int i = 0; i < cs.size(); i++)
{
int sel = cs.columnAt(i);
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
sel = av.getColumnSelection().findColumnPosition(sel);
}
@@ -415,7 +423,7 @@ public class ScalePanel extends Panel implements MouseMotionListener,
}
}
- if (av.hasHiddenColumns)
+ if (av.hasHiddenColumns())
{
gg.setColor(Color.blue);
int res;
@@ -445,7 +453,8 @@ public class ScalePanel extends Panel 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);
}
}