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-2416 allow alphabet symbol (optional) in first column of score table
[jalview.git]
/
src
/
jalview
/
gui
/
RedundancyPanel.java
diff --git
a/src/jalview/gui/RedundancyPanel.java
b/src/jalview/gui/RedundancyPanel.java
index
eac0d46
..
cbbcf70
100755
(executable)
--- a/
src/jalview/gui/RedundancyPanel.java
+++ b/
src/jalview/gui/RedundancyPanel.java
@@
-82,6
+82,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
slider.addChangeListener(new ChangeListener()
{
slider.addChangeListener(new ChangeListener()
{
+ @Override
public void stateChanged(ChangeEvent evt)
{
valueField.setText(slider.getValue() + "");
public void stateChanged(ChangeEvent evt)
{
valueField.setText(slider.getValue() + "");
@@
-105,6
+106,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
false);
frame.addInternalFrameListener(new InternalFrameAdapter()
{
false);
frame.addInternalFrameListener(new InternalFrameAdapter()
{
+ @Override
public void internalFrameClosing(InternalFrameEvent evt)
{
ap.getIdPanel().getIdCanvas().setHighlighted(null);
public void internalFrameClosing(InternalFrameEvent evt)
{
ap.getIdPanel().getIdCanvas().setHighlighted(null);
@@
-125,6
+127,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
*
* @return DOCUMENT ME!
*/
*
* @return DOCUMENT ME!
*/
+ @Override
public void run()
{
JProgressBar progress = new JProgressBar();
public void run()
{
JProgressBar progress = new JProgressBar();
@@
-171,7
+174,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_threshold"));
slider.setVisible(true);
applyButton.setEnabled(true);
valueField.setVisible(true);
slider.setVisible(true);
applyButton.setEnabled(true);
valueField.setVisible(true);
@@
-206,6
+210,7
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
+ @Override
public void applyButton_actionPerformed(ActionEvent e)
{
Vector del = new Vector();
public void applyButton_actionPerformed(ActionEvent e)
{
Vector del = new Vector();
@@
-240,7
+245,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
+263,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());
}
}
}
}
@@
-268,19
+275,22
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
* @param e
* DOCUMENT ME!
*/
* @param e
* DOCUMENT ME!
*/
+ @Override
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();
}
@@
-292,22
+302,4
@@
public class RedundancyPanel extends GSliderPanel implements Runnable
}
}
}
}
- /**
- * DOCUMENT ME!
- *
- * @param e
- * DOCUMENT ME!
- */
- public void valueField_actionPerformed(ActionEvent e)
- {
- try
- {
- int i = Integer.parseInt(valueField.getText());
- slider.setValue(i);
- } catch (Exception ex)
- {
- valueField.setText(slider.getValue() + "");
- }
- }
-
}
}