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-1421 typed map / lists, explicit imports, method refactoring
[jalview.git]
/
src
/
jalview
/
appletgui
/
FeatureSettings.java
diff --git
a/src/jalview/appletgui/FeatureSettings.java
b/src/jalview/appletgui/FeatureSettings.java
index
584a69a
..
40a2ce5
100755
(executable)
--- a/
src/jalview/appletgui/FeatureSettings.java
+++ b/
src/jalview/appletgui/FeatureSettings.java
@@
-59,8
+59,8
@@
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
import java.util.Arrays;
import java.util.Enumeration;
import java.awt.event.WindowEvent;
import java.util.Arrays;
import java.util.Enumeration;
-import java.util.Hashtable;
import java.util.List;
import java.util.List;
+import java.util.Map;
import java.util.Vector;
public class FeatureSettings extends Panel implements ItemListener,
import java.util.Vector;
public class FeatureSettings extends Panel implements ItemListener,
@@
-201,7
+201,8
@@
public class FeatureSettings extends Panel implements ItemListener,
60);
}
60);
}
- protected void popupSort(final MyCheckbox check, final Hashtable minmax,
+ protected void popupSort(final MyCheckbox check,
+ final Map<String, float[][]> minmax,
int x, int y)
{
final String type = check.type;
int x, int y)
{
final String type = check.type;
@@
-239,7
+240,7
@@
public class FeatureSettings extends Panel implements ItemListener,
men.add(dens);
if (minmax != null)
{
men.add(dens);
if (minmax != null)
{
- final Object typeMinMax = minmax.get(type);
+ final float[][] typeMinMax = minmax.get(type);
/*
* final java.awt.CheckboxMenuItem chb = new
* java.awt.CheckboxMenuItem("Vary Height"); // this is broken at the
/*
* final java.awt.CheckboxMenuItem chb = new
* java.awt.CheckboxMenuItem("Vary Height"); // this is broken at the
@@
-252,7
+253,7
@@
public class FeatureSettings extends Panel implements ItemListener,
*
* }); men.add(chb);
*/
*
* }); men.add(chb);
*/
- if (typeMinMax != null && ((float[][]) typeMinMax)[0] != null)
+ if (typeMinMax != null && typeMinMax[0] != null)
{
// graduated colourschemes for those where minmax exists for the
// positional features
{
// graduated colourschemes for those where minmax exists for the
// positional features
@@
-338,7
+339,7
@@
public class FeatureSettings extends Panel implements ItemListener,
{
SequenceFeature[] tmpfeatures;
String group = null, type;
{
SequenceFeature[] tmpfeatures;
String group = null, type;
- Vector visibleChecks = new Vector();
+ Vector<String> visibleChecks = new Vector<String>();
AlignmentI alignment = av.getAlignment();
for (int i = 0; i < alignment.getHeight(); i++)
{
AlignmentI alignment = av.getAlignment();
for (int i = 0; i < alignment.getHeight(); i++)
{
@@
-404,7
+405,7
@@
public class FeatureSettings extends Panel implements ItemListener,
// now add checkboxes which should be visible,
// if they have not already been added
// now add checkboxes which should be visible,
// if they have not already been added
- Enumeration en = visibleChecks.elements();
+ Enumeration<String> en = visibleChecks.elements();
while (en.hasMoreElements())
{
while (en.hasMoreElements())
{