X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FSliderPanel.java;h=dbc94e8d239dc6366854b6ffe413e66dc38b6bb8;hb=refs%2Fheads%2Fj2s%2Fdevelop-bh;hp=14fab4e799f9782dbc63095b898989071a5ceaac;hpb=7ab5d6b0ba5fec1ea4a4239e79c476d841622485;p=jalview.git diff --git a/src/jalview/appletgui/SliderPanel.java b/src/jalview/appletgui/SliderPanel.java index 14fab4e..dbc94e8 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-Rel$$) + * Copyright (C) $$Year-Rel$$ The Jalview Authors * * This file is part of Jalview. * @@ -20,15 +20,31 @@ */ package jalview.appletgui; -import java.util.*; - -import java.awt.*; -import java.awt.event.*; - -import jalview.datamodel.*; -import jalview.schemes.*; +import jalview.bin.JalviewLite; +import jalview.datamodel.SequenceGroup; +import jalview.schemes.ColourSchemeI; import jalview.util.MessageManager; +import java.awt.BorderLayout; +import awt2swing.Button; +import awt2swing.Checkbox; +import java.awt.Color; +import java.awt.FlowLayout; +import awt2swing.Frame; +import awt2swing.Label; +import awt2swing.Panel; +import awt2swing.Scrollbar; +import awt2swing.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 +75,7 @@ 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); @@ -85,7 +100,7 @@ public class SliderPanel extends Panel implements ActionListener, if (!conservationSlider.isVisible()) { - jalview.bin.JalviewLite.addFrame(conservationSlider, + JalviewLite.addFrame(conservationSlider, conservationSlider.getTitle(), 420, 100); conservationSlider.addWindowListener(new WindowAdapter() { @@ -114,7 +129,7 @@ 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) { @@ -141,7 +156,7 @@ public class SliderPanel extends Panel implements ActionListener, if (!PIDSlider.isVisible()) { - jalview.bin.JalviewLite.addFrame(PIDSlider, PIDSlider.getTitle(), + JalviewLite.addFrame(PIDSlider, PIDSlider.getTitle(), 420, 100); PIDSlider.addWindowListener(new WindowAdapter() { @@ -216,13 +231,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 {