Changeset 10198 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java

Timestamp:

2016-05-12T16:37:14+02:00 (8 years ago)

Author:

Don-vip

Message:

add more unit tests

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (modified) (10 diffs)

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

@@ -25 +25 @@
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.conflict.Conflict;
-import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.BBox;
-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.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -50 +43 @@
 import org.openstreetmap.josm.gui.widgets.JosmTextArea;
 import org.openstreetmap.josm.tools.GBC;
-import org.openstreetmap.josm.tools.Geometry;
 import org.openstreetmap.josm.tools.WindowGeometry;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -68 +59 @@
     private boolean editcountTabLoaded;
 
-    public InspectPrimitiveDialog(Collection<OsmPrimitive> primitives, OsmDataLayer layer) {
+    /**
+     * Constructs a new {@code InspectPrimitiveDialog}.
+     * @param primitives collection of primitives
+     * @param layer data layer
+     */
+    public InspectPrimitiveDialog(final Collection<OsmPrimitive> primitives, OsmDataLayer layer) {
         super(Main.parent, tr("Advanced object info"), new String[] {tr("Close")});
         this.primitives = new ArrayList<>(primitives);
@@ -78 +74 @@
         final JTabbedPane tabs = new JTabbedPane();
 
-        tabs.addTab(tr("data"), genericMonospacePanel(new JPanel(), buildDataText()));
+        tabs.addTab(tr("data"), genericMonospacePanel(new JPanel(), buildDataText(layer, this.primitives)));
 
         final JPanel pMapPaint = new JPanel();
@@ -101 +97 @@
                 if (!editcountTabLoaded && ((SingleSelectionModel) e.getSource()).getSelectedIndex() == 2) {
                     editcountTabLoaded = true;
-                    genericMonospacePanel(pEditCounts, buildListOfEditorsText());
+                    genericMonospacePanel(pEditCounts, buildListOfEditorsText(primitives));
                 }
             }
@@ -109 +105 @@
     }
 
-    protected JPanel genericMonospacePanel(JPanel p, String s) {
+    protected static JPanel genericMonospacePanel(JPanel p, String s) {
         p.setLayout(new GridBagLayout());
         JosmTextArea jte = new JosmTextArea();
@@ -119 +115 @@
     }
 
-    protected String buildDataText() {
-        DataText dt = new DataText();
+    protected static String buildDataText(OsmDataLayer layer, List<OsmPrimitive> primitives) {
+        InspectPrimitiveDataText dt = new InspectPrimitiveDataText(layer);
         Collections.sort(primitives, new OsmPrimitiveComparator());
         for (OsmPrimitive o : primitives) {
@@ -128 +124 @@
     }
 
-    class DataText {
-        private static final String INDENT = "  ";
-        private static final char NL = '\n';
-
-        private final StringBuilder s = new StringBuilder();
-
-        private DataText add(String title, String... values) {
-            s.append(INDENT).append(title);
-            for (String v : values) {
-                s.append(v);
-            }
-            s.append(NL);
-            return this;
-        }
-
-        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 addPrimitive(OsmPrimitive o) {
-
-            addHeadline(o);
-
-            if (!(o.getDataSet() != null && o.getDataSet().getPrimitiveById(o) != null)) {
-                s.append(NL).append(INDENT).append(tr("not in data set")).append(NL);
-                return;
-            }
-            if (o.isIncomplete()) {
-                s.append(NL).append(INDENT).append(tr("incomplete")).append(NL);
-                return;
-            }
-            s.append(NL);
-
-            addState(o);
-            addCommon(o);
-            addAttributes(o);
-            addSpecial(o);
-            addReferrers(s, o);
-            addConflicts(o);
-            s.append(NL);
-        }
-
-        void addHeadline(OsmPrimitive o) {
-            addType(o);
-            addNameAndId(o);
-        }
-
-        void addType(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: "));
-            }
-        }
-
-        void addNameAndId(OsmPrimitive o) {
-            String name = o.get("name");
-            if (name == null) {
-                s.append(o.getUniqueId());
-            } else {
-                s.append(getNameAndId(name, o.getUniqueId()));
-            }
-        }
-
-        void addState(OsmPrimitive o) {
-            StringBuilder sb = new StringBuilder(INDENT);
-            /* selected state is left out: not interesting as it is always selected */
-            if (o.isDeleted()) {
-                sb.append(tr("deleted")).append(INDENT);
-            }
-            if (!o.isVisible()) {
-                sb.append(tr("deleted-on-server")).append(INDENT);
-            }
-            if (o.isModified()) {
-                sb.append(tr("modified")).append(INDENT);
-            }
-            if (o.isDisabledAndHidden()) {
-                sb.append(tr("filtered/hidden")).append(INDENT);
-            }
-            if (o.isDisabled()) {
-                sb.append(tr("filtered/disabled")).append(INDENT);
-            }
-            if (o.hasDirectionKeys()) {
-                if (o.reversedDirection()) {
-                    sb.append(tr("has direction keys (reversed)")).append(INDENT);
-                } else {
-                    sb.append(tr("has direction keys")).append(INDENT);
-                }
-            }
-            String state = sb.toString().trim();
-            if (!state.isEmpty()) {
-                add(tr("State: "), sb.toString().trim());
-            }
-        }
-
-        void addCommon(OsmPrimitive o) {
-            add(tr("Data Set: "), Integer.toHexString(o.getDataSet().hashCode()));
-            add(tr("Edited at: "), o.isTimestampEmpty() ? tr("<new object>")
-                    : DateUtils.fromTimestamp(o.getRawTimestamp()));
-            add(tr("Edited by: "), o.getUser() == null ? tr("<new object>")
-                    : getNameAndId(o.getUser().getName(), o.getUser().getId()));
-            add(tr("Version: "), Integer.toString(o.getVersion()));
-            add(tr("In changeset: "), Integer.toString(o.getChangesetId()));
-        }
-
-        void addAttributes(OsmPrimitive o) {
-            if (o.hasKeys()) {
-                add(tr("Tags: "));
-                for (String key : o.keySet()) {
-                    s.append(INDENT).append(INDENT);
-                    s.append(String.format("\"%s\"=\"%s\"%n", key, o.get(key)));
-                }
-            }
-        }
-
-        void addSpecial(OsmPrimitive o) {
-            if (o instanceof Node) {
-                addCoordinates((Node) o);
-            } else if (o instanceof Way) {
-                addBbox(o);
-                add(tr("Centroid: "), Main.getProjection().eastNorth2latlon(
-                        Geometry.getCentroid(((Way) o).getNodes())).toStringCSV(", "));
-                addWayNodes((Way) o);
-            } else if (o instanceof Relation) {
-                addBbox(o);
-                addRelationMembers((Relation) o);
-            }
-        }
-
-        void addRelationMembers(Relation r) {
-            add(trn("{0} Member: ", "{0} Members: ", r.getMembersCount(), r.getMembersCount()));
-            for (RelationMember m : r.getMembers()) {
-                s.append(INDENT).append(INDENT);
-                addHeadline(m.getMember());
-                s.append(tr(" as \"{0}\"", m.getRole()));
-                s.append(NL);
-            }
-        }
-
-        void addWayNodes(Way w) {
-            add(tr("{0} Nodes: ", w.getNodesCount()));
-            for (Node n : w.getNodes()) {
-                s.append(INDENT).append(INDENT);
-                addNameAndId(n);
-                s.append(NL);
-            }
-        }
-
-        void addBbox(OsmPrimitive o) {
-            BBox bbox = o.getBBox();
-            if (bbox != null) {
-                add(tr("Bounding box: "), bbox.toStringCSV(", "));
-                EastNorth bottomRigth = Main.getProjection().latlon2eastNorth(bbox.getBottomRight());
-                EastNorth topLeft = Main.getProjection().latlon2eastNorth(bbox.getTopLeft());
-                add(tr("Bounding box (projected): "),
-                        Double.toString(topLeft.east()), ", ",
-                        Double.toString(bottomRigth.north()), ", ",
-                        Double.toString(bottomRigth.east()), ", ",
-                        Double.toString(topLeft.north()));
-                add(tr("Center of bounding box: "), bbox.getCenter().toStringCSV(", "));
-            }
-        }
-
-        void addCoordinates(Node n) {
-            if (n.getCoor() != null) {
-                add(tr("Coordinates: "),
-                        Double.toString(n.getCoor().lat()), ", ",
-                        Double.toString(n.getCoor().lon()));
-                add(tr("Coordinates (projected): "),
-                        Double.toString(n.getEastNorth().east()), ", ",
-                        Double.toString(n.getEastNorth().north()));
-            }
-        }
-
-        void addReferrers(StringBuilder s, OsmPrimitive o) {
-            List<OsmPrimitive> refs = o.getReferrers();
-            if (!refs.isEmpty()) {
-                add(tr("Part of: "));
-                for (OsmPrimitive p : refs) {
-                    s.append(INDENT).append(INDENT);
-                    addHeadline(p);
-                    s.append(NL);
-                }
-            }
-        }
-
-        void addConflicts(OsmPrimitive o) {
-            Conflict<?> c = layer.getConflicts().getConflictForMy(o);
-            if (c != null) {
-                add(tr("In conflict with: "));
-                addNameAndId(c.getTheir());
-            }
-        }
-
-        @Override
-        public String toString() {
-            return s.toString();
-        }
-    }
-
-    protected String buildMapPaintText() {
+    protected static String buildMapPaintText() {
         final Collection<OsmPrimitive> sel = Main.main.getCurrentDataSet().getAllSelected();
         ElemStyles elemstyles = MapPaintStyles.getStyles();
@@ -392 +182 @@
         Count only tagged nodes (so empty way nodes don't inflate counts).
     */
-    protected String buildListOfEditorsText() {
+    protected static String buildListOfEditorsText(Iterable<OsmPrimitive> primitives) {
         final StringBuilder s = new StringBuilder();
         final Map<String, Integer> editCountByUser = new TreeMap<>(Collator.getInstance(Locale.getDefault()));
@@ -416 +206 @@
             final String username = entry.getKey();
             final Integer editCount = entry.getValue();
-            s.append(String.format("%6d  %s%n", editCount, username));
+            s.append(String.format("%6d  %s\n", editCount, username));
         }
         return s.toString();