X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=a381e8b8b0a5084a90d3794993089a65da8dcf56;hb=fbc92d8f171f75002890bfa0ea1f436f7125d3b5;hp=48f09f8b86209e57befdcf599605300ea041068c;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index 48f09f8..a381e8b 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! @@ -136,8 +140,10 @@ 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) { @@ -213,7 +219,10 @@ public class SliderPanel extends GSliderPanel pid.cs = cs; } - PIDSlider.setTitle("Percentage Identity Threshold (" + source + ")"); + PIDSlider + .setTitle(MessageManager.formatMessage( + "label.percentage_identity_threshold", + new String[] { source })); if (ap.av.getAlignment().getGroups() != null) { @@ -287,13 +296,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 { @@ -301,7 +312,7 @@ public class SliderPanel extends GSliderPanel } } - ap.seqPanel.seqCanvas.repaint(); + ap.getSeqPanel().seqCanvas.repaint(); } /**