X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFeatureSettings.java;h=19283828e98dc8857c77c6cbdb991809fb71df28;hb=80916c21f32a24ec777b51c758df0cc2f57f6bb8;hp=35690a95f2425796561d25b91b32dc9140f5fdd2;hpb=2a5cbe264ec842c1a0f93e6bd78294607a94e686;p=jalview.git diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java index 35690a9..1928382 100755 --- 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")); - 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; - while (e.hasMoreElements()) + while (e.hasNext()) { - sortTypes[i] = e.nextElement().toString(); + sortTypes[i] = e.next().toString(); sortOrder[i] = fr.getOrder(sortTypes[i]); i++; } @@ -1134,13 +1134,13 @@ public class FeatureSettings extends JPanel 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; - 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()) {