Changeset 30315 in osm for applications/editors/josm/plugins/smed2/src/panels/PanelMain.java

Timestamp:

2014-03-02T12:17:41+01:00 (11 years ago)

Author:

malcolmh

Message:

save

File:

• applications/editors/josm/plugins/smed2/src/panels/PanelMain.java (modified) (5 diffs)

applications/editors/josm/plugins/smed2/src/panels/PanelMain.java

@@ -19 +19 @@
 import java.awt.image.BufferedImage;
 import java.io.*;
+import java.util.ArrayList;
 
 import javax.imageio.ImageIO;
@@ -27 +28 @@
 import org.openstreetmap.josm.Main;
 
+import s57.S57val.AttVal;
 import s57.S57att.*;
 import s57.S57obj.*;
@@ -175 +177 @@
                 for (Obj obj : feature.objs.keySet()) {
                         decode.append("\t\t" + Messages.getString(obj.name()) + "\n");
-/*                      if (feature.aggr.objs.get(obj).size() != 0) {
+                        if (feature.objs.get(obj).size() != 0) {
                                 for (AttMap atts : feature.objs.get(obj).values()) {
                                         for (Att att : atts.keySet()) {
@@ -185 +187 @@
                                                 case L:
                                                         decode.append("\t\t\t" + Messages.getString(att.name()) + ": ");
-                                                        Iterator<?> it = ((ArrayList<?>)item.val).iterator();
-                                                        while (it.hasNext()) {
-                                                                Object val = it.next();
+                                                        boolean first = true;
+                                                        for (Object val : (ArrayList<?>)item.val) {
+                                                                if (!first) {
+                                                                        decode.append(", ");
+                                                                } else {
+                                                                        first = false;
+                                                                }
                                                                 decode.append(Messages.getString(((Enum<?>)val).name()));
-                                                                if (it.hasNext()) {
-                                                                        decode.append(", ");
-                                                                }
                                                         }
                                                         decode.append("\n");
@@ -201 +204 @@
                                 }
                         }
-*/              }
+                }
         }