X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSliderPanel.java;h=d506e5f9731118e83a80e1e1e782a84200a01c0b;hb=838e4f91d4a53dd315640dbc9ff6ef7a815ee576;hp=14fab4e799f9782dbc63095b898989071a5ceaac;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java index 14fab4e..d506e5f 100644 --- 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.2) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * @@ -20,15 +20,30 @@ */ package jalview.appletgui; -import java.util.*; - -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 { @@ -59,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); @@ -114,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) { @@ -216,13 +235,15 @@ public class SliderPanel extends Panel implements ActionListener, } 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 {