X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FScalePanel.java;h=01e4284a29beeb5fd12b67e6e579fbee9c086576;hb=0155cd99a3b96570ad67dbc992c731ba2ce74bb9;hp=89d315c4ed7292cdfcf36cedacb4fe774bcc06f8;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/gui/ScalePanel.java b/src/jalview/gui/ScalePanel.java
index 89d315c..01e4284 100755
--- a/src/jalview/gui/ScalePanel.java
+++ b/src/jalview/gui/ScalePanel.java
@@ -1,27 +1,46 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, 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 .
+ * 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.gui;
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-
-import jalview.datamodel.*;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.util.MessageManager;
+
+import java.awt.Color;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.MouseMotionListener;
+
+import javax.swing.JMenuItem;
+import javax.swing.JPanel;
+import javax.swing.JPopupMenu;
+import javax.swing.SwingUtilities;
+import javax.swing.ToolTipManager;
/**
* DOCUMENT ME!
@@ -92,7 +111,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 +130,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,7 +151,8 @@ 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)
@@ -319,7 +341,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
if (mouseDragging)
{
- ap.seqPanel.scrollCanvas(null);
+ ap.getSeqPanel().scrollCanvas(null);
}
}
@@ -327,7 +349,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
if (mouseDragging)
{
- ap.seqPanel.scrollCanvas(evt);
+ ap.getSeqPanel().scrollCanvas(evt);
}
}
@@ -347,6 +369,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
res = av.getColumnSelection().adjustForHiddenColumns(res);
reveal = null;
+ if (av.getColumnSelection().getHiddenColumns() != null)
+ {
for (int i = 0; i < av.getColumnSelection().getHiddenColumns().size(); i++)
{
int[] region = (int[]) av.getColumnSelection().getHiddenColumns()
@@ -355,7 +379,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
@@ -364,7 +389,7 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
}
}
-
+ }
repaint();
}
@@ -457,18 +482,18 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
}
gg.drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
y + 2,
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
y + (fm.getDescent() * 2));
}
else
{
gg.drawLine(
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
y + fm.getDescent(),
- (int) (((i - startx - 1) * av.charWidth) + (av.charWidth / 2)),
+ ((i - startx - 1) * av.charWidth) + (av.charWidth / 2),
y + (fm.getDescent() * 2));
}
}
@@ -477,7 +502,8 @@ public class ScalePanel extends JPanel implements MouseMotionListener,
{
gg.setColor(Color.blue);
int res;
- if (av.getShowHiddenMarkers())
+ if (av.getShowHiddenMarkers()
+ && av.getColumnSelection().getHiddenColumns() != null)
{
for (int i = 0; i < av.getColumnSelection().getHiddenColumns()
.size(); i++)
@@ -503,7 +529,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);
}
}