X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fappletgui%2FSliderPanel.java;h=2fc15d0e290807607fe458e957710ae7752d8a05;hb=053c5f25f135f0eeeb60acad625b246dc66e75fc;hp=90d5227c2a482b2c1595e77cc21e5fd6ad8b5ce2;hpb=59d682209891099d46b960509907c79e3fb276fe;p=jalview.git
diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java
old mode 100755
new mode 100644
index 90d5227..2fc15d0
--- a/src/jalview/appletgui/SliderPanel.java
+++ b/src/jalview/appletgui/SliderPanel.java
@@ -1,30 +1,48 @@
/*
- * 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-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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;
-import java.util.*;
-import java.util.List;
-
-import java.awt.*;
-import java.awt.event.*;
-
-import jalview.datamodel.*;
-import jalview.schemes.*;
+import jalview.datamodel.SequenceGroup;
+import jalview.schemes.ColourSchemeI;
+import jalview.util.MessageManager;
+
+import java.awt.BorderLayout;
+import java.awt.Button;
+import java.awt.Checkbox;
+import java.awt.Color;
+import java.awt.FlowLayout;
+import java.awt.Frame;
+import java.awt.Label;
+import java.awt.Panel;
+import java.awt.Scrollbar;
+import java.awt.TextField;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.awt.event.AdjustmentEvent;
+import java.awt.event.AdjustmentListener;
+import java.awt.event.MouseEvent;
+import java.awt.event.MouseListener;
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.Iterator;
public class SliderPanel extends Panel implements ActionListener,
AdjustmentListener, MouseListener
@@ -56,8 +74,10 @@ public class SliderPanel extends Panel implements ActionListener,
sp.cs = cs;
}
- conservationSlider.setTitle("Conservation Colour Increment (" + source
- + ")");
+ conservationSlider
+ .setTitle(MessageManager.formatMessage(
+ "label.conservation_colour_increment",
+ new String[] { source }));
if (ap.av.getAlignment().getGroups() != null)
{
sp.setAllGroupsCheckEnabled(true);
@@ -111,7 +131,9 @@ public class SliderPanel extends Panel implements ActionListener,
pid = (SliderPanel) PIDSlider.getComponent(0);
pid.cs = cs;
}
- PIDSlider.setTitle("Percentage Identity Threshold (" + source + ")");
+ PIDSlider.setTitle(MessageManager
+ .formatMessage("label.percentage_identity_thereshold",
+ new String[] { source }));
if (ap.av.getAlignment().getGroups() != null)
{
@@ -168,14 +190,16 @@ 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);
@@ -195,35 +219,37 @@ 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);
}
else
{
- toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus());
+ toChange.setThreshold(i, ap.av.isIgnoreGapsConsensus());
}
-
- } 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();
@@ -314,23 +340,26 @@ 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.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);