X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FSliderPanel.java;h=3eff177853ff40512e05a9b56a8bc420c45f1c0c;hb=dfa04e77181fccfa6229ffef1591fc9c622d9b39;hp=8c290b5b45fe315b88baa9f2b5d84ab28f5be597;hpb=2de8acfae59aced665e4c37ad0f7dcc2ed68818e;p=jalview.git
diff --git a/src/jalview/gui/SliderPanel.java b/src/jalview/gui/SliderPanel.java
index 8c290b5..3eff177 100755
--- a/src/jalview/gui/SliderPanel.java
+++ b/src/jalview/gui/SliderPanel.java
@@ -1,20 +1,20 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Development Version 2.4.1)
- * Copyright (C) 2009 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
*
- * This program 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 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program 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.
+ * 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 this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * 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;
@@ -27,6 +27,7 @@ import javax.swing.event.*;
import jalview.datamodel.*;
import jalview.jbgui.*;
import jalview.schemes.*;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -50,13 +51,13 @@ public class SliderPanel extends GSliderPanel
* Creates a new SliderPanel object.
*
* @param ap
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param value
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param forConserve
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param cs
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public SliderPanel(final AlignmentPanel ap, int value,
boolean forConserve, ColourSchemeI cs)
@@ -69,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);
}
@@ -105,11 +106,11 @@ public class SliderPanel extends GSliderPanel
* DOCUMENT ME!
*
* @param ap
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param cs
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param source
- * DOCUMENT ME!
+ * DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
@@ -134,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);
}
@@ -161,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()
{
@@ -180,11 +181,11 @@ public class SliderPanel extends GSliderPanel
* DOCUMENT ME!
*
* @param ap
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param cs
- * DOCUMENT ME!
+ * DOCUMENT ME!
* @param source
- * DOCUMENT ME!
+ * DOCUMENT ME!
*
* @return DOCUMENT ME!
*/
@@ -210,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);
}
@@ -257,7 +258,7 @@ public class SliderPanel extends GSliderPanel
* DOCUMENT ME!
*
* @param i
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void valueChanged(int i)
{
@@ -267,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
@@ -316,7 +317,7 @@ public class SliderPanel extends GSliderPanel
* DOCUMENT ME!
*
* @param b
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void setAllGroupsCheckEnabled(boolean b)
{
@@ -327,7 +328,7 @@ public class SliderPanel extends GSliderPanel
* DOCUMENT ME!
*
* @param e
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void valueField_actionPerformed(ActionEvent e)
{
@@ -345,7 +346,7 @@ public class SliderPanel extends GSliderPanel
* DOCUMENT ME!
*
* @param value
- * DOCUMENT ME!
+ * DOCUMENT ME!
*/
public void setValue(int value)
{