X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fappletgui%2FFeatureColourChooser.java;h=32ffdbf4b480a7baca3cb4dc5a27865d95c96d7e;hb=47c72d35e5716a194ef2396cd1e6b81a91cbb0ea;hp=bcee04c889a7b00f52c6e7f4fc8d0fc9bcc724e6;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java
index bcee04c..32ffdbf 100644
--- a/src/jalview/appletgui/FeatureColourChooser.java
+++ b/src/jalview/appletgui/FeatureColourChooser.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.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.appletgui;
@@ -24,7 +27,7 @@ import java.awt.event.*;
import jalview.datamodel.*;
import jalview.schemes.*;
-import java.awt.Rectangle;
+import jalview.util.MessageManager;
public class FeatureColourChooser extends Panel implements ActionListener,
AdjustmentListener, ItemListener, MouseListener
@@ -113,8 +116,9 @@ public class FeatureColourChooser extends Panel implements ActionListener,
slider.addAdjustmentListener(this);
slider.addMouseListener(this);
owner = (af != null) ? af : fs.frame;
- frame = new JVDialog(owner, "Graduated Feature Colour for " + type,
- true, 480, 248);
+ frame = new JVDialog(owner, MessageManager.formatMessage(
+ "label.graduated_color_for_params", new String[]
+ { type }), true, 480, 248);
frame.setMainPanel(this);
validate();
frame.setVisible(true);
@@ -144,7 +148,8 @@ public class FeatureColourChooser extends Panel implements ActionListener,
private void jbInit() throws Exception
{
- Label minLabel = new Label("Min:"), maxLabel = new Label("Max:");
+ Label minLabel = new Label(MessageManager.getString("label.min")), maxLabel = new Label(
+ MessageManager.getString("label.max"));
minLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
maxLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
// minColour.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
@@ -168,9 +173,12 @@ public class FeatureColourChooser extends Panel implements ActionListener,
jPanel2.setBackground(Color.white);
jPanel4.setBackground(Color.white);
threshold.addItemListener(this);
- threshold.addItem("No Threshold");
- threshold.addItem("Above Threshold");
- threshold.addItem("Below Threshold");
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_no_thereshold"));
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_above_thereshold"));
+ threshold.addItem(MessageManager
+ .getString("label.threshold_feature_below_thereshold"));
thresholdValue.addActionListener(this);
slider.setBackground(Color.white);
slider.setEnabled(false);
@@ -183,11 +191,13 @@ public class FeatureColourChooser extends Panel implements ActionListener,
jPanel3.setBackground(Color.white);
colourFromLabel.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));
- colourFromLabel.setLabel("Colour by Label");
+ colourFromLabel.setLabel(MessageManager
+ .getString("label.colour_by_label"));
colourFromLabel.setSize(new Dimension(139, 22));
// threshold.setBounds(new Rectangle(11, 3, 139, 22));
thresholdIsMin.setBackground(Color.white);
- thresholdIsMin.setLabel("Threshold is min/max");
+ thresholdIsMin.setLabel(MessageManager
+ .getString("label.threshold_minmax"));
thresholdIsMin.setSize(new Dimension(135, 23));
// thresholdIsMin.setBounds(new Rectangle(328, 3, 135, 23));
jPanel1.add(minLabel);
@@ -287,8 +297,9 @@ public class FeatureColourChooser extends Panel implements ActionListener,
{
if (newCol == null)
{
- UserDefinedColours udc = new UserDefinedColours(this, minColour
- .getBackground(), owner, "Select Colour for Minimum Value"); // frame.owner,
+ UserDefinedColours udc = new UserDefinedColours(this,
+ minColour.getBackground(), owner,
+ MessageManager.getString("label.select_colour_minimum_value")); // frame.owner,
}
else
{
@@ -307,8 +318,9 @@ public class FeatureColourChooser extends Panel implements ActionListener,
// UserDefinedColours udc = new UserDefinedColours(this,
// "Select Colour for Maximum Value",maxColour.getBackground(),true);
- UserDefinedColours udc = new UserDefinedColours(this, maxColour
- .getBackground(), owner, "Select Colour for Maximum Value");
+ UserDefinedColours udc = new UserDefinedColours(this,
+ maxColour.getBackground(), owner,
+ MessageManager.getString("label.select_colour_maximum_value"));
}
else
{
@@ -328,11 +340,11 @@ public class FeatureColourChooser extends Panel implements ActionListener,
}
int aboveThreshold = AnnotationColourGradient.NO_THRESHOLD;
- if (threshold.getSelectedItem().equals("Above Threshold"))
+ if (threshold.getSelectedIndex() == 1)
{
aboveThreshold = AnnotationColourGradient.ABOVE_THRESHOLD;
}
- else if (threshold.getSelectedItem().equals("Below Threshold"))
+ else if (threshold.getSelectedIndex() == 2)
{
aboveThreshold = AnnotationColourGradient.BELOW_THRESHOLD;
}