X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fgui%2FRedundancyPanel.java;h=1fcd87593e9088f14df8c87224739ca76af9c5ab;hb=aec85d6dfc1dd5970a50a53dc9d161635d1e9960;hp=0038939c29455daf9bd8b286dfa57043e12da217;hpb=4cea7a0328724b90a6a7c16ae8c926e0cc12cedd;p=jalview.git
diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java
index 0038939..1fcd875 100755
--- a/src/jalview/gui/RedundancyPanel.java
+++ b/src/jalview/gui/RedundancyPanel.java
@@ -1,19 +1,22 @@
/*
- * 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.2)
+ * 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.
+ * 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 .
+ * 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;
@@ -85,8 +88,9 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
frame = new JInternalFrame();
frame.setContentPane(this);
- Desktop.addInternalFrame(frame, MessageManager.getString("label.redundancy_threshold_selection"), 400,
- 100, false);
+ Desktop.addInternalFrame(frame, MessageManager
+ .getString("label.redundancy_threshold_selection"), 400, 100,
+ false);
frame.addInternalFrameListener(new InternalFrameAdapter()
{
public void internalFrameClosing(InternalFrameEvent evt)
@@ -155,12 +159,13 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
progress.setVisible(false);
progress = null;
- label.setText("Enter the redundancy threshold");
+ label.setText(MessageManager.getString("label.enter_redundancy_thereshold"));
slider.setVisible(true);
applyButton.setEnabled(true);
valueField.setVisible(true);
validate();
+ sliderValueChanged();
// System.out.println((System.currentTimeMillis()-start));
}
@@ -172,21 +177,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);
}
/**
@@ -229,7 +228,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
}
}
- EditCommand cut = new EditCommand("Remove Redundancy",
+ EditCommand cut = new EditCommand(MessageManager.getString("action.remove_redundancy"),
EditCommand.CUT, deleted, 0, width, ap.av.getAlignment());
for (int i = 0; i < del.size(); i++)