X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFeatureColourChooser.java;h=7c9caa1784e9cbaae00b70990ad5448feef8c3ae;hb=a8f483d04205bb8273ee311c12968b7e86d205fa;hp=4f673570d4a81a7c4a85b960b6477ac267171063;hpb=797df64fa2a0a30773d0f48f5494d4155e5a8be3;p=jalview.git diff --git a/src/jalview/appletgui/FeatureColourChooser.java b/src/jalview/appletgui/FeatureColourChooser.java index 4f67357..7c9caa1 100644 --- a/src/jalview/appletgui/FeatureColourChooser.java +++ b/src/jalview/appletgui/FeatureColourChooser.java @@ -1,19 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, 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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.appletgui; @@ -24,7 +25,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,7 +114,7 @@ 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, + frame = new JVDialog(owner, MessageManager.formatMessage("label.graduated_color_for_params", new String[]{type}), true, 480, 248); frame.setMainPanel(this); validate(); @@ -144,7 +145,7 @@ 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 +169,9 @@ 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 +184,11 @@ 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); @@ -289,7 +290,7 @@ public class FeatureColourChooser extends Panel implements ActionListener, { UserDefinedColours udc = new UserDefinedColours(this, minColour.getBackground(), owner, - "Select Colour for Minimum Value"); // frame.owner, + MessageManager.getString("label.select_colour_minimum_value")); // frame.owner, } else { @@ -310,7 +311,7 @@ public class FeatureColourChooser extends Panel implements ActionListener, // "Select Colour for Maximum Value",maxColour.getBackground(),true); UserDefinedColours udc = new UserDefinedColours(this, maxColour.getBackground(), owner, - "Select Colour for Maximum Value"); + MessageManager.getString("label.select_colour_maximum_value")); } else { @@ -330,11 +331,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; }