git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
JAL-1528 bug fixes and adjustments to Chimera interface
[jalview.git]
/
src
/
jalview
/
gui
/
RedundancyPanel.java
diff --git
a/src/jalview/gui/RedundancyPanel.java
b/src/jalview/gui/RedundancyPanel.java
index
91f2450
..
0e55cf8
100755
(executable)
--- a/
src/jalview/gui/RedundancyPanel.java
+++ b/
src/jalview/gui/RedundancyPanel.java
@@
-159,7
+159,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
progress.setVisible(false);
progress = null;
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);
slider.setVisible(true);
applyButton.setEnabled(true);
valueField.setVisible(true);
@@
-245,8
+245,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
ap.alignFrame.addHistoryItem(cut);
PaintRefresher.Refresh(this, ap.av.getSequenceSetId(), true, true);
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());
}
}
}
}
@@
-259,12
+258,17
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
*/
public void undoButton_actionPerformed(ActionEvent e)
{
*/
public void undoButton_actionPerformed(ActionEvent e)
{
+ if(historyList == null || historyList.isEmpty()){
+ undoButton.setEnabled(false);
+ return;
+ }
+
CommandI command = (CommandI) historyList.pop();
CommandI command = (CommandI) historyList.pop();
- command.undoCommand(af.getViewAlignments());
-
if (ap.av.historyList.contains(command))
{
if (ap.av.historyList.contains(command))
{
+ command.undoCommand(af.getViewAlignments());
ap.av.historyList.remove(command);
ap.av.historyList.remove(command);
+ ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences());
af.updateEditMenuBar();
}
af.updateEditMenuBar();
}