X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSliderPanel.java;h=fc33c42b68725de0cfc3561444e09288ab344685;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=d25caa4fe3308c0f69a81a3aa5d429cff19f188b;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git
diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
old mode 100755
new mode 100644
index d25caa4..fc33c42
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -1,6 +1,6 @@
/*
- * 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.1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
@@ -14,6 +14,7 @@
* 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,6 +25,7 @@ import java.awt.event.*;
import jalview.datamodel.*;
import jalview.schemes.*;
+import jalview.util.MessageManager;
public class SliderPanel extends Panel implements ActionListener,
AdjustmentListener, MouseListener
@@ -167,14 +169,14 @@ public class SliderPanel extends Panel implements ActionListener,
applyButton.setVisible(false);
if (forConservation)
{
- label.setText("Modify conservation visibility");
+ label.setText(MessageManager.getString("label.modify_conservation_visibility"));
slider.setMinimum(0);
slider.setMaximum(50 + slider.getVisibleAmount());
slider.setUnitIncrement(1);
}
else
{
- label.setText("Colour residues above % occurence");
+ label.setText(MessageManager.getString("label.colour_residues_above_occurence"));
slider.setMinimum(0);
slider.setMaximum(100 + slider.getVisibleAmount());
slider.setBlockIncrement(1);
@@ -194,25 +196,16 @@ public class SliderPanel extends Panel implements ActionListener,
return;
}
- ColourSchemeI toChange = null;
+ ColourSchemeI toChange = cs;
Iterator allGroups = null;
if (allGroupsCheck.getState())
{
allGroups = ap.av.getAlignment().getGroups().listIterator();
}
- else
- {
- toChange = cs;
- }
- do
+ while (toChange != null)
{
- if (allGroups != null)
- {
- toChange = allGroups.next().cs;
- }
-
if (forConservation)
{
toChange.setConservationInc(i);
@@ -221,8 +214,17 @@ public class SliderPanel extends Panel implements ActionListener,
{
toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
}
-
- } while (allGroups != null && allGroups.hasNext());
+ if (allGroups != null && allGroups.hasNext())
+ {
+ while ((toChange = allGroups.next().cs) == null
+ && allGroups.hasNext())
+ ;
+ }
+ else
+ {
+ toChange = null;
+ }
+ }
ap.seqPanel.seqCanvas.repaint();
@@ -313,23 +315,24 @@ public class SliderPanel extends Panel implements ActionListener,
slider.setFont(new java.awt.Font("Verdana", 0, 11));
slider.setOrientation(0);
valueField.setFont(new java.awt.Font("Verdana", 0, 11));
- valueField.setText(" ");
- valueField.addActionListener(this);
+ valueField.setText(" ");
+ valueField.addActionListener(this);
+ valueField.setColumns(3);
label.setFont(new java.awt.Font("Verdana", 0, 11));
- label.setText("set this label text");
+ label.setText(MessageManager.getString("label.set_this_label_text"));
jPanel1.setLayout(borderLayout1);
jPanel2.setLayout(flowLayout1);
applyButton.setFont(new java.awt.Font("Verdana", 0, 11));
- applyButton.setLabel("Apply");
+ applyButton.setLabel(MessageManager.getString("action.apply"));
applyButton.addActionListener(this);
undoButton.setEnabled(false);
undoButton.setFont(new java.awt.Font("Verdana", 0, 11));
- undoButton.setLabel("Undo");
+ undoButton.setLabel(MessageManager.getString("action.undo"));
undoButton.addActionListener(this);
allGroupsCheck.setEnabled(false);
allGroupsCheck.setFont(new java.awt.Font("Verdana", 0, 11));
- allGroupsCheck.setLabel("Apply threshold to all groups");
- allGroupsCheck.setName("Apply to all Groups");
+ allGroupsCheck.setLabel(MessageManager.getString("action.apply_threshold_all_groups"));
+ allGroupsCheck.setName(MessageManager.getString("action.apply_all_groups"));
this.setBackground(Color.white);
this.setForeground(Color.black);
jPanel2.add(label, null);