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
javadoc
[jalview.git]
/
src
/
jalview
/
gui
/
FeatureSettings.java
diff --git
a/src/jalview/gui/FeatureSettings.java
b/src/jalview/gui/FeatureSettings.java
index
35690a9
..
1928382
100755
(executable)
--- a/
src/jalview/gui/FeatureSettings.java
+++ b/
src/jalview/gui/FeatureSettings.java
@@
-714,13
+714,13
@@
public class FeatureSettings extends JPanel
PrintWriter out = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(choice), "UTF-8"));
PrintWriter out = new PrintWriter(new OutputStreamWriter(
new FileOutputStream(choice), "UTF-8"));
- Enumeration e = fr.featureColours.keys();
+ Iterator e = fr.featureColours.keySet().iterator();
float[] sortOrder = new float[fr.featureColours.size()];
String[] sortTypes = new String[fr.featureColours.size()];
int i = 0;
float[] sortOrder = new float[fr.featureColours.size()];
String[] sortTypes = new String[fr.featureColours.size()];
int i = 0;
- while (e.hasMoreElements())
+ while (e.hasNext())
{
{
- sortTypes[i] = e.nextElement().toString();
+ sortTypes[i] = e.next().toString();
sortOrder[i] = fr.getOrder(sortTypes[i]);
i++;
}
sortOrder[i] = fr.getOrder(sortTypes[i]);
i++;
}
@@
-1134,13
+1134,13
@@
public class FeatureSettings extends JPanel
if (fr.featureGroups != null)
{
if (fr.featureGroups != null)
{
- Enumeration en = fr.featureGroups.keys();
+ Iterator en = fr.featureGroups.keySet().iterator();
gps = new String[fr.featureColours.size()];
int g = 0;
boolean valid = false;
gps = new String[fr.featureColours.size()];
int g = 0;
boolean valid = false;
- while (en.hasMoreElements())
+ while (en.hasNext())
{
{
- String gp = (String) en.nextElement();
+ String gp = (String) en.next();
Boolean on = (Boolean) fr.featureGroups.get(gp);
if (on != null && on.booleanValue())
{
Boolean on = (Boolean) fr.featureGroups.get(gp);
if (on != null && on.booleanValue())
{