X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=af6bfff9e43ae3e5c5560c1f6d0a1db7b54b16a7;hb=0e90e35fa87e18e80a340f982110b03c5eccc503;hp=1bac4504fff41382881a55e3501c61ab64187e52;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index 1bac450..af6bfff 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,16 +20,20 @@ */ package jalview.gui; -import java.util.*; +import jalview.datamodel.SequenceGroup; +import jalview.jbgui.GSliderPanel; +import jalview.schemes.ColourSchemeI; +import jalview.util.MessageManager; -import java.awt.event.*; -import javax.swing.*; -import javax.swing.event.*; +import java.awt.event.ActionEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.util.Iterator; -import jalview.datamodel.*; -import jalview.jbgui.*; -import jalview.schemes.*; -import jalview.util.MessageManager; +import javax.swing.JInternalFrame; +import javax.swing.JLayeredPane; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; /** * DOCUMENT ME! @@ -72,13 +76,15 @@ public class SliderPanel extends GSliderPanel if (forConservation) { - label.setText(MessageManager.getString("label.enter_value_increase_conservation_visibility")); + label.setText(MessageManager + .getString("label.enter_value_increase_conservation_visibility")); slider.setMinimum(0); slider.setMaximum(100); } else { - label.setText(MessageManager.getString("label.enter_percentage_identity_above_which_colour_residues")); + label.setText(MessageManager + .getString("label.enter_percentage_identity_above_which_colour_residues")); slider.setMinimum(0); slider.setMaximum(100); } @@ -134,8 +140,7 @@ public class SliderPanel extends GSliderPanel 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) { @@ -211,7 +216,7 @@ public class SliderPanel extends GSliderPanel 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) { @@ -285,13 +290,15 @@ public class SliderPanel extends GSliderPanel } else { - toChange.setThreshold(i, ap.av.getIgnoreGapsConsensus()); + toChange.setThreshold(i, ap.av.isIgnoreGapsConsensus()); } if (allGroups != null && allGroups.hasNext()) { while ((toChange = allGroups.next().cs) == null && allGroups.hasNext()) + { ; + } } else { @@ -299,7 +306,7 @@ public class SliderPanel extends GSliderPanel } } - ap.seqPanel.seqCanvas.repaint(); + ap.getSeqPanel().seqCanvas.repaint(); } /**