X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=3eff177853ff40512e05a9b56a8bc420c45f1c0c;hb=260c50cca8fff9b7e15e311dfc9fd9dda685950b;hp=77fa4008db8e245c1bf0efd9b13200c1adc61d6d;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java index 77fa400..3eff177 100755 --- a/src/jalview/gui/SliderPanel.java +++ b/src/jalview/gui/SliderPanel.java @@ -1,19 +1,20 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 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. - * + * * 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 . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -26,6 +27,7 @@ import javax.swing.event.*; import jalview.datamodel.*; import jalview.jbgui.*; import jalview.schemes.*; +import jalview.util.MessageManager; /** * DOCUMENT ME! @@ -68,13 +70,13 @@ public class SliderPanel extends GSliderPanel if (forConservation) { - label.setText("Enter value to increase conservation visibility"); + label.setText(MessageManager.getString("label.enter_value_increase_conservation_visibility")); slider.setMinimum(0); slider.setMaximum(100); } else { - label.setText("Enter % identity above which to colour residues"); + label.setText(MessageManager.getString("label.enter_percentage_identity_above_which_colour_residues")); slider.setMinimum(0); slider.setMaximum(100); } @@ -133,7 +135,7 @@ public class SliderPanel extends GSliderPanel conservationSlider.setTitle("Conservation Colour Increment (" + source + ")"); - if (ap.av.alignment.getGroups() != null) + if (ap.av.getAlignment().getGroups() != null) { sp.setAllGroupsCheckEnabled(true); } @@ -160,8 +162,8 @@ public class SliderPanel extends GSliderPanel if (!conservationSlider.isVisible()) { - Desktop.addInternalFrame(conservationSlider, conservationSlider - .getTitle(), 420, 90, false); + Desktop.addInternalFrame(conservationSlider, + conservationSlider.getTitle(), 420, 90, false); conservationSlider .addInternalFrameListener(new javax.swing.event.InternalFrameAdapter() { @@ -209,7 +211,7 @@ public class SliderPanel extends GSliderPanel PIDSlider.setTitle("Percentage Identity Threshold (" + source + ")"); - if (ap.av.alignment.getGroups() != null) + if (ap.av.getAlignment().getGroups() != null) { pid.setAllGroupsCheckEnabled(true); } @@ -266,12 +268,12 @@ public class SliderPanel extends GSliderPanel } ColourSchemeI toChange = null; - Vector allGroups = null; + List allGroups = null; int groupIndex = 0; if (allGroupsCheck.isSelected()) { - allGroups = ap.av.alignment.getGroups(); + allGroups = ap.av.getAlignment().getGroups(); groupIndex = allGroups.size() - 1; } else