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 order score models by order of addition rather than name
[jalview.git]
/
src
/
jalview
/
gui
/
AnnotationColumnChooser.java
diff --git
a/src/jalview/gui/AnnotationColumnChooser.java
b/src/jalview/gui/AnnotationColumnChooser.java
index
32f3ccd
..
1290d70
100644
(file)
--- a/
src/jalview/gui/AnnotationColumnChooser.java
+++ b/
src/jalview/gui/AnnotationColumnChooser.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b1)
- * Copyright (C) 2015 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.
*
@@
-178,7
+178,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- ok_actionPerformed(e);
+ ok_actionPerformed();
}
});
}
});
@@
-189,7
+189,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- cancel_actionPerformed(e);
+ cancel_actionPerformed();
}
});
}
});
@@
-201,7
+201,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- threshold_actionPerformed(e);
+ threshold_actionPerformed();
}
});
}
});
@@
-212,7
+212,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
@Override
public void actionPerformed(ActionEvent e)
{
@Override
public void actionPerformed(ActionEvent e)
{
- thresholdValue_actionPerformed(e);
+ thresholdValue_actionPerformed();
}
});
}
});
@@
-288,14
+288,15
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
String defaultTtip = MessageManager
.getString("info.change_threshold_mode_to_enable");
String defaultTtip = MessageManager
.getString("info.change_threshold_mode_to_enable");
- String threshold = getThreshold().getSelectedItem().toString();
- if (threshold.equalsIgnoreCase("No Threshold"))
+ String thresh = getThreshold().getSelectedItem().toString();
+ if (thresh.equalsIgnoreCase("No Threshold"))
{
thresholdValue.setToolTipText(defaultTtip);
slider.setToolTipText(defaultTtip);
}
}
{
thresholdValue.setToolTipText(defaultTtip);
slider.setToolTipText(defaultTtip);
}
}
+ @Override
public void reset()
{
if (this.getOldColumnSelection() != null)
public void reset()
{
if (this.getOldColumnSelection() != null)
@@
-324,6
+325,7
@@
public class AnnotationColumnChooser extends AnnotationRowFilter implements
}
}
+ @Override
public void valueChanged(boolean updateAllAnnotation)
{
if (slider.isEnabled())
public void valueChanged(boolean updateAllAnnotation)
{
if (slider.isEnabled())