X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fgui%2FRedundancyPanel.java;h=0e55cf89f733d8dc081b57a6ad261a9a3e97208a;hb=357dccf7919daec097dc63aa805c7336d88e89f8;hp=323d7f102372e338bd4f60186f9fadeff771cdd1;hpb=ad9fc20de0dcc3737c75a777915973497791e393;p=jalview.git
diff --git a/src/jalview/gui/RedundancyPanel.java b/src/jalview/gui/RedundancyPanel.java
index 323d7f1..0e55cf8 100755
--- a/src/jalview/gui/RedundancyPanel.java
+++ b/src/jalview/gui/RedundancyPanel.java
@@ -1,19 +1,21 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * 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;
@@ -86,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)
@@ -156,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));
}
@@ -224,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++)
@@ -241,8 +245,7 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
ap.alignFrame.addHistoryItem(cut);
PaintRefresher.Refresh(this, ap.av.getSequenceSetId(), true, true);
- // ap.av.firePropertyChange("alignment", null, ap.av.getAlignment()
- // .getSequences());
+ ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences());
}
}
@@ -255,12 +258,17 @@ public class RedundancyPanel extends GSliderPanel implements Runnable
*/
public void undoButton_actionPerformed(ActionEvent e)
{
+ if(historyList == null || historyList.isEmpty()){
+ undoButton.setEnabled(false);
+ return;
+ }
+
CommandI command = (CommandI) historyList.pop();
- command.undoCommand(af.getViewAlignments());
-
if (ap.av.historyList.contains(command))
{
+ command.undoCommand(af.getViewAlignments());
ap.av.historyList.remove(command);
+ ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences());
af.updateEditMenuBar();
}