Ticket #6741: 6741.patch

src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

@@ -9 +9 @@
 import java.awt.GridBagLayout;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map.Entry;
 
@@ -24 +23 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
-import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.OsmPrimitiveComparator;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -49 +44 @@
 import org.openstreetmap.josm.gui.mappaint.xml.XmlStyleSource;
 import org.openstreetmap.josm.tools.DateUtils;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.SubclassFilteredCollection;
 import org.openstreetmap.josm.tools.WindowGeometry;
 
 /**
@@ -60 +54 @@
  * to better understand the JOSM data representation.
  */
 public class InspectPrimitiveDialog extends ExtendedDialog {
-    protected List<OsmPrimitive> primitives;
+
+    protected Collection<OsmPrimitive> primitives;
     protected OsmDataLayer layer;
     private JTextArea txtData;
     private JTextArea txtMappaint;
@@ -73 +68 @@
         setRememberWindowGeometry(getClass().getName() + ".geometry",
                 WindowGeometry.centerInWindow(Main.parent, new Dimension(750, 550)));
 
-        setButtonIcons(new String[] {"ok.png"});
+        setButtonIcons(new String[]{"ok.png"});
         final JTabbedPane tabs = new JTabbedPane();
         JPanel pData = buildDataPanel();
         tabs.addTab(tr("data"), pData);
@@ -107 +102 @@
     }
 
     protected String buildDataText() {
-        StringBuilder s = new StringBuilder();
-
-        Collections.sort(primitives, new OsmPrimitiveComparator());
-
-        String sep = "";
+        DataText dt = new DataText();
         for (OsmPrimitive o : primitives) {
-            s.append(sep);
-            sep = "\n";
-            addInfo(s, o);
+            dt.addPrimitive(o);
         }
-
-        return s.toString();
+        return dt.toString();
     }
 
-    protected void addInfo(StringBuilder s, OsmPrimitive o) {
-        o.visit(new AddPrimitiveInfoVisitor(s));
-        addConflicts(s, o);
-    }
+    class DataText {
 
-    protected void addConflicts(StringBuilder s, OsmPrimitive o) {
-        ConflictCollection conflicts = layer.getConflicts();
-        Conflict<?> c = conflicts.getConflictForMy(o);
-        if (c != null) {
-            s.append(tr("In conflict with:\n"));
-            c.getTheir().visit(new AddPrimitiveInfoVisitor(s));
+        StringBuilder s = new StringBuilder();
+
+        private DataText add(String title, String... values) {
+            s.append("  ").append(tr(title));
+            for (String v : values) {
+                s.append(v);
+            }
+            s.append("\n");
+            return this;
         }
-    }
 
-    protected class AddPrimitiveInfoVisitor extends AbstractVisitor {
-        StringBuilder s;
+        private DataText add(String title, int value) {
+            return add(title, Integer.toString(value));
+        }
 
-        public AddPrimitiveInfoVisitor(StringBuilder s) {
-            this.s = s;
+        private String getNameAndId(String name, long id) {
+            if (name != null) {
+                return name + tr(" ({0})", /* sic to avoid thousand seperators */ Long.toString(id));
+            } else {
+                return Long.toString(id);
+            }
         }
 
-        public void visit(Node n) {
-            s.append(tr("Node id={0}", n.getUniqueId()));
-            if (!checkDataSet(n)) {
-                s.append(tr(" not in data set"));
+        void addPrimitive(OsmPrimitive o) {
+
+            addHeadline(o);
+
+            if (!(o.getDataSet() != null && o.getDataSet().getPrimitiveById(o) != null)) {
+                s.append("\n  ").append(tr("not in data set"));
                 return;
             }
-            if (n.isIncomplete()) {
-                s.append(tr(" incomplete\n"));
-                addWayReferrer(s, n);
-                addRelationReferrer(s, n);
+            if (o.isIncomplete()) {
+                s.append("\n  ").append(tr("incomplete"));
                 return;
             }
-            s.append(tr(" lat={0} lon={1} (projected: x={2}, y={3}); ",
-                    Double.toString(n.getCoor().lat()), Double.toString(n.getCoor().lon()),
-                    Double.toString(n.getEastNorth().east()), Double.toString(n.getEastNorth().north())));
-            addCommon(s, n);
-            addAttributes(s, n);
-            addWayReferrer(s, n);
-            addRelationReferrer(s, n);
+            s.append("\n");
+
+            addState(o);
+            addCommon(o);
+            addAttributes(o);
+            addSpecial(o);
+            addReferrers(s, o);
+            addConflicts(o);
+            s.append("\n");
         }
 
-        public void visit(Way w) {
-            s.append(tr("Way id={0}", w.getUniqueId()));
-            if (!checkDataSet(w)) {
-                s.append(tr(" not in data set"));
-                return;
+        void addHeadline(OsmPrimitive o) {
+            if (o instanceof Node) {
+                s.append(tr("Node: "));
+            } else if (o instanceof Way) {
+                s.append(tr("Way: "));
+            } else if (o instanceof Relation) {
+                s.append(tr("Relation: "));
             }
-            if (w.isIncomplete()) {
-                s.append(tr(" incomplete\n"));
-                addRelationReferrer(s, w);
-                return;
-            }
-            s.append(trn(" {0} node; ", " {0} nodes; ", w.getNodes().size(), w.getNodes().size()));
-            addCommon(s, w);
-            addAttributes(s, w);
-            addRelationReferrer(s, w);
 
-            s.append(tr("  nodes:\n"));
-            for (Node n : w.getNodes()) {
-                s.append(String.format("    %d\n", n.getUniqueId()));
+            String name = o.get("name");
+            if (name == null) {
+                s.append(o.getUniqueId());
+            } else {
+                s.append(getNameAndId(name, o.getUniqueId()));
             }
         }
 
-        public void visit(Relation r) {
-            s.append(tr("Relation id={0}",r.getUniqueId()));
-            if (!checkDataSet(r)) {
-                s.append(tr(" not in data set"));
-                return;
+        void addState(OsmPrimitive o) {
+            StringBuilder sb = new StringBuilder("  ");
+            /* selected state is left out: not interesting as it is always selected */
+            if (o.isDeleted()) {
+                sb.append(tr("deleted")).append(" ");
             }
-            if (r.isIncomplete()) {
-                s.append(tr(" incomplete\n"));
-                addRelationReferrer(s, r);
-                return;
+            if (!o.isVisible()) {
+                sb.append(tr("deleted-on-server")).append(" ");
+            }
+            if (o.isModified()) {
+                s.append(tr("modified")).append(" ");
             }
-            s.append(trn(" {0} member; ", " {0} members; ", r.getMembersCount(), r.getMembersCount()));
-            addCommon(s, r);
-            addAttributes(s, r);
-            addRelationReferrer(s, r);
-
-            s.append(tr("  members:\n"));
-            for (RelationMember m : r.getMembers() ) {
-                s.append(String.format("    %s%d '%s'\n", m.getMember().getType().getAPIName().substring(0,1), m.getMember().getUniqueId(), m.getRole()));
+            if (o.isDisabledAndHidden()) {
+                sb.append(tr("filtered/hidden")).append(" ");
+            }
+            if (o.isDisabled()) {
+                sb.append(tr("filtered/disabled")).append(" ");
+            }
+            if (o.hasDirectionKeys()) {
+                if (o.reversedDirection()) {
+                    sb.append(tr("has direction keys (reversed)")).append(" ");
+                } else {
+                    sb.append(tr("has direction keys")).append(" ");
+                }
             }
+            sb.append("\n");
+            s.append(sb.toString().trim());
         }
-    }
 
-    protected void addCommon(StringBuilder s, OsmPrimitive o) {
-        s.append(tr("Data set: {0}; User: [{1}]; ChangeSet id: {2}; Timestamp: {3}; Version: {4}",
-                Integer.toHexString(o.getDataSet().hashCode()),
-                userString(o.getUser()),
-                o.getChangesetId(),
-                o.isTimestampEmpty() ? tr("<new object>") : DateUtils.fromDate(o.getTimestamp()),
-                o.getVersion()));
-
-        /* selected state is left out: not interesting as it is always selected */
-        if (o.isDeleted()) {
-            s.append(tr("; deleted"));
-        }
-        if (!o.isVisible()) {
-            s.append(tr("; deleted-on-server"));
-        }
-        if (o.isModified()) {
-            s.append(tr("; modified"));
-        }
-        if (o.isDisabledAndHidden()) {
-            s.append(tr("; filtered/hidden"));
-        }
-        if (o.isDisabled()) {
-            s.append(tr("; filtered/disabled"));
+        void addCommon(OsmPrimitive o) {
+            add("Data Set: ", Integer.toHexString(o.getDataSet().hashCode()));
+            add("Edited at: ", o.isTimestampEmpty() ? tr("<new object>")
+                    : DateUtils.fromDate(o.getTimestamp()));
+            add("Edited by: ", o.getUser() == null ? tr("<new object>")
+                    : getNameAndId(o.getUser().getName(), o.getUser().getId()));
+            add("Version: ", o.getVersion());
+            add("In changeset: ", o.getChangesetId());
         }
-        if (o.hasDirectionKeys()) {
-            s.append(tr("; has direction keys"));
-            if (o.reversedDirection()) {
-                s.append(tr(" (reversed)"));
+
+        void addAttributes(OsmPrimitive o) {
+            if (o.hasKeys()) {
+                add("Tags: ");
+                for (String key : o.keySet()) {
+                    s.append(String.format("    \"%s\"=\"%s\"\n", key, o.get(key)));
+                }
             }
         }
-        s.append("\n");
-    }
 
-    protected void addAttributes(StringBuilder s, OsmPrimitive o) {
-        if (o.hasKeys()) {
-            s.append(tr("  tags:\n"));
-            for (String key: o.keySet()) {
-                s.append(String.format("    \"%s\"=\"%s\"\n", key, o.get(key)));
+        void addSpecial(OsmPrimitive o) {
+            if (o instanceof Node) {
+                addCorrdinates((Node) o);
+            } else if (o instanceof Way) {
+                addWayNodes((Way) o);
+            } else if (o instanceof Relation) {
+                addRelationMembers((Relation) o);
             }
         }
-    }
 
-    protected void addWayReferrer(StringBuilder s, Node n) {
-        // add way referrer
-        List<OsmPrimitive> refs = n.getReferrers();
-        Collection<Way> wayRefs = new SubclassFilteredCollection<OsmPrimitive, Way>(refs, OsmPrimitive.wayPredicate);
-        if (wayRefs.size() > 0) {
-            s.append(tr("  way referrer:\n"));
-            for (Way w : wayRefs) {
-                s.append("    "+w.getUniqueId()+"\n");
+        void addRelationMembers(Relation r) {
+            s.append(trn("  {0} Member: ", "  {0} Members: ", r.getMembersCount(), r.getMembersCount())).append("\n");
+            for (RelationMember m : r.getMembers()) {
+                s.append("    ");
+                addHeadline(m.getMember());
+                s.append(tr(" as {0}", m.getRole()));
+                s.append("\n");
             }
         }
-    }
 
-    protected void addRelationReferrer(StringBuilder s, OsmPrimitive o) {
-        List<OsmPrimitive> refs = o.getReferrers();
-        Collection<Relation> relRefs = new SubclassFilteredCollection<OsmPrimitive, Relation>(refs, OsmPrimitive.relationPredicate);
-        if (relRefs.size() > 0) {
-            s.append(tr("  relation referrer:\n"));
-            for (Relation r : relRefs) {
-                s.append("    "+r.getUniqueId()+"\n");
+        void addWayNodes(Way w) {
+            add("Nodes: ");
+            for (Node n : w.getNodes()) {
+                s.append("    ");
+                addHeadline(n);
+                s.append("\n");
             }
         }
-    }
-
-    /**
-     * See if primitive is in a data set properly.
-     * This does not hold for primitives that are new and deleted.
-     */
-    protected boolean checkDataSet(OsmPrimitive o) {
-        DataSet ds = o.getDataSet();
-        if (ds == null)
-            return false;
-        return ds.getPrimitiveById(o) != null;
-    }
 
-    protected String userString(User user) {
-        if (user == null)
-            return tr("<new object>");
-
-        List<String> names = user.getNames();
+        void addCorrdinates(Node n) {
+            add("Coordinates: ",
+                    Double.toString(n.getCoor().lat()), ", ",
+                    Double.toString(n.getCoor().lon()));
+            add("Coordinates (projected): ",
+                    Double.toString(n.getEastNorth().east()), ", ",
+                    Double.toString(n.getEastNorth().north()));
+        }
 
-        StringBuilder us = new StringBuilder();
+        void addReferrers(StringBuilder s, OsmPrimitive o) {
+            List<OsmPrimitive> refs = o.getReferrers();
+            if (!refs.isEmpty()) {
+                add("Part of: ");
+                for (OsmPrimitive p : refs) {
+                    s.append("    ");
+                    addHeadline(p);
+                    s.append("\n");
+                }
+            }
+        }
 
-        us.append(tr("id: {0}",user.getId()));
-        if (names.size() == 1) {
-            us.append(tr(" name: {0}",user.getName()));
+        void addConflicts(OsmPrimitive o) {
+            ConflictCollection conflicts = layer.getConflicts();
+            Conflict<?> c = conflicts.getConflictForMy(o);
+            if (c != null) {
+                add(tr("In conflict with: "));
+                addPrimitive(c.getTheir());
+            }
         }
-        else if (names.size() > 1) {
-            us.append(trn(" {0} name: {1}", " {0} names: {1}", names.size(), names.size(), user.getName()));
+
+        @Override
+        public String toString() {
+            return s.toString();
         }
-        return us.toString();
     }
 
     protected void buildMapPaintPanel(JPanel p) {
@@ -318 +303 @@
         double scale = nc.getDist100Pixel();
 
         for (OsmPrimitive osm : sel) {
-            txtMappaint.append(tr("Styles Cache for \"{0}\":",osm.getDisplayName(DefaultNameFormatter.getInstance())));
+            txtMappaint.append(tr("Styles Cache for \"{0}\":", osm.getDisplayName(DefaultNameFormatter.getInstance())));
 
             MultiCascade mc = new MultiCascade();
 
             for (StyleSource s : elemstyles.getStyleSources()) {
                 if (s.active) {
-                    txtMappaint.append(tr("\n\n> applying {0} style \"{1}\"\n",getSort(s), s.getDisplayString()));
+                    txtMappaint.append(tr("\n\n> applying {0} style \"{1}\"\n", getSort(s), s.getDisplayString()));
                     s.apply(mc, osm, scale, null, false);
-                    txtMappaint.append(tr("\nRange:{0}",mc.range));
+                    txtMappaint.append(tr("\nRange:{0}", mc.range));
                     for (Entry<String, Cascade> e : mc.getLayers()) {
-                        txtMappaint.append("\n "+e.getKey()+": \n"+e.getValue());
+                        txtMappaint.append("\n " + e.getKey() + ": \n" + e.getValue());
                     }
                 } else {
-                    txtMappaint.append(tr("\n\n> skipping \"{0}\" (not active)",s.getDisplayString()));
+                    txtMappaint.append(tr("\n\n> skipping \"{0}\" (not active)", s.getDisplayString()));
                 }
             }
             txtMappaint.append(tr("\n\nList of generated Styles:\n"));
             StyleList sl = elemstyles.get(osm, scale, nc);
             for (ElemStyle s : sl) {
-                txtMappaint.append(" * "+s+"\n");
+                txtMappaint.append(" * " + s + "\n");
             }
             txtMappaint.append("\n\n");
         }
@@ -359 +344 @@
     }
 
     private String getSort(StyleSource s) {
-        if (s instanceof XmlStyleSource)
+        if (s instanceof XmlStyleSource) {
             return tr("xml");
-        if (s instanceof MapCSSStyleSource)
+        } else if (s instanceof MapCSSStyleSource) {
             return tr("mapcss");
-        return tr("unknown");
+        } else {
+            return tr("unknown");
+        }
     }
-
 }