X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FRedundancyPanel.java;h=59ee1e743897f139f9ae9d873d881f6b39bd0e77;hb=b2f9a8d7bce642ff4011bc6d49e02bb0569fbb11;hp=08481d01c88b5dd3ccb2d9fc6321bd999ace6786;hpb=ad20cd92225f2ee8c251d39b00b90555d382a616;p=jalview.git
diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java
index 08481d0..59ee1e7 100755
--- a/src/jalview/gui/RedundancyPanel.java
+++ b/src/jalview/gui/RedundancyPanel.java
@@ -1,6 +1,6 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
@@ -14,6 +14,7 @@
* 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;
@@ -27,6 +28,7 @@ import jalview.analysis.AlignSeq;
import jalview.commands.*;
import jalview.datamodel.*;
import jalview.jbgui.*;
+import jalview.util.MessageManager;
/**
* DOCUMENT ME!
@@ -73,7 +75,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
}
});
- applyButton.setText("Remove");
+ applyButton.setText(MessageManager.getString("action.remove"));
allGroupsCheck.setVisible(false);
slider.setMinimum(0);
slider.setMaximum(100);
@@ -84,7 +86,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
frame = new JInternalFrame();
frame.setContentPane(this);
- Desktop.addInternalFrame(frame, "Redundancy threshold selection", 400,
+ Desktop.addInternalFrame(frame, MessageManager.getString("label.redundancy_threshold_selection"), 400,
100, false);
frame.addInternalFrameListener(new InternalFrameAdapter()
{
@@ -114,7 +116,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
progress.setIndeterminate(true);
southPanel.add(progress, java.awt.BorderLayout.SOUTH);
- label.setText("Calculating....");
+ label.setText(MessageManager.getString("label.calculating"));
slider.setVisible(false);
applyButton.setEnabled(false);
@@ -160,6 +162,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
valueField.setVisible(true);
validate();
+ sliderValueChanged();
// System.out.println((System.currentTimeMillis()-start));
}
@@ -171,21 +174,15 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
}
float value = slider.getValue();
-
+ List redundantSequences = new ArrayList();
for (int i = 0; i < redundancy.length; i++)
{
- if (value > redundancy[i])
- {
- redundantSeqs.remove(originalSequences[i]);
- }
- else if (!redundantSeqs.contains(originalSequences[i]))
+ if (value <= redundancy[i])
{
- redundantSeqs.add(originalSequences[i]);
+ redundantSequences.add(originalSequences[i]);
}
-
}
-
- ap.idPanel.idCanvas.setHighlighted(redundantSeqs);
+ ap.idPanel.idCanvas.setHighlighted(redundantSequences);
}
/**