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

Timestamp:

2017-08-27T17:07:54+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15182 - move ConflictCollection from OsmDataLayer to DataSet. Simplifies some code where a data set is enough, and a layer is not needed

File:

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

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

@@ -22 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -28 +29 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.mappaint.Cascade;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
@@ -53 +53 @@
 
     protected transient List<OsmPrimitive> primitives;
-    protected transient OsmDataLayer layer;
     private boolean mappaintTabLoaded;
     private boolean editcountTabLoaded;
@@ -60 +59 @@
      * Constructs a new {@code InspectPrimitiveDialog}.
      * @param primitives collection of primitives
-     * @param layer data layer
+     * @param data data set
+     * @since 12672 (signature)
      */
-    public InspectPrimitiveDialog(final Collection<OsmPrimitive> primitives, OsmDataLayer layer) {
+    public InspectPrimitiveDialog(final Collection<OsmPrimitive> primitives, DataSet data) {
         super(Main.parent, tr("Advanced object info"), tr("Close"));
         this.primitives = new ArrayList<>(primitives);
-        this.layer = layer;
         setRememberWindowGeometry(getClass().getName() + ".geometry",
                 WindowGeometry.centerInWindow(Main.parent, new Dimension(750, 550)));
@@ -72 +71 @@
         final JTabbedPane tabs = new JTabbedPane();
 
-        tabs.addTab(tr("data"), genericMonospacePanel(new JPanel(), buildDataText(layer, this.primitives)));
+        tabs.addTab(tr("data"), genericMonospacePanel(new JPanel(), buildDataText(data, this.primitives)));
 
         final JPanel pMapPaint = new JPanel();
@@ -106 +105 @@
     }
 
-    protected static String buildDataText(OsmDataLayer layer, List<OsmPrimitive> primitives) {
-        InspectPrimitiveDataText dt = new InspectPrimitiveDataText(layer);
+    protected static String buildDataText(DataSet data, List<OsmPrimitive> primitives) {
+        InspectPrimitiveDataText dt = new InspectPrimitiveDataText(data);
         primitives.stream()
                 .sorted(OsmPrimitiveComparator.orderingWaysRelationsNodes().thenComparing(OsmPrimitiveComparator.comparingNames()))