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-2156 getter for AlignFrame(s) held in a splitframe
[jalview.git]
/
src
/
jalview
/
gui
/
RedundancyPanel.java
diff --git
a/src/jalview/gui/RedundancyPanel.java
b/src/jalview/gui/RedundancyPanel.java
index
44583ba
..
7fb0593
100755
(executable)
--- 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.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-107,7
+107,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
{
public void internalFrameClosing(InternalFrameEvent evt)
{
{
public void internalFrameClosing(InternalFrameEvent evt)
{
- ap.idPanel.idCanvas.setHighlighted(null);
+ ap.getIdPanel().getIdCanvas().setHighlighted(null);
}
});
}
});
@@
-171,7
+171,8
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
progress.setVisible(false);
progress = null;
progress.setVisible(false);
progress = null;
- label.setText(MessageManager.getString("label.enter_redundancy_thereshold"));
+ 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);
@@
-197,7
+198,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
redundantSequences.add(originalSequences[i]);
}
}
redundantSequences.add(originalSequences[i]);
}
}
- ap.idPanel.idCanvas.setHighlighted(redundantSequences);
+ ap.getIdPanel().getIdCanvas().setHighlighted(redundantSequences);
}
/**
}
/**
@@
-240,7
+241,8
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
}
}
}
}
- EditCommand cut = new EditCommand(MessageManager.getString("action.remove_redundancy"),
+ EditCommand cut = new EditCommand(
+ MessageManager.getString("action.remove_redundancy"),
Action.CUT, deleted, 0, width, ap.av.getAlignment());
for (int i = 0; i < del.size(); i++)
Action.CUT, deleted, 0, width, ap.av.getAlignment());
for (int i = 0; i < del.size(); i++)
@@
-257,7
+259,8
@@
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());
}
}
}
}
@@
-270,17
+273,19
@@
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;
+ if (historyList == null || historyList.isEmpty())
+ {
+ undoButton.setEnabled(false);
+ return;
}
}
-
+
CommandI command = historyList.pop();
CommandI command = historyList.pop();
- if (ap.av.historyList.contains(command))
+ if (ap.av.getHistoryList().contains(command))
{
command.undoCommand(af.getViewAlignments());
{
command.undoCommand(af.getViewAlignments());
- ap.av.historyList.remove(command);
- ap.av.firePropertyChange("alignment", null, ap.av.getAlignment().getSequences());
+ ap.av.getHistoryList().remove(command);
+ ap.av.firePropertyChange("alignment", null, ap.av.getAlignment()
+ .getSequences());
af.updateEditMenuBar();
}
af.updateEditMenuBar();
}