Changeset 13564 in josm for trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

Timestamp:

2018-03-25T18:53:04+02:00 (6 years ago)

Author:

Don-vip

Message:

introduce PrimitiveRenderer to replace OsmPrimitivRenderer (now deprecated). Change NameFormatter API to support IPrimitive instead of OsmPrimitive. Enhances interfaces in consequence.

File:

• trunk/src/org/openstreetmap/josm/actions/PurgeAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

@@ -30 +30 @@
 import org.openstreetmap.josm.command.PurgeCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.gui.ConditionalOptionPaneUtil;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.help.HelpUtil;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -76 +77 @@
 
     /** force selection to be active for all entries */
-    static class SelectionForcedOsmPrimitivRenderer extends OsmPrimitivRenderer {
+    static class SelectionForcedPrimitiveRenderer extends PrimitiveRenderer {
         @Override
-        public Component getListCellRendererComponent(JList<? extends OsmPrimitive> list,
-                OsmPrimitive value, int index, boolean isSelected, boolean cellHasFocus) {
+        public Component getListCellRendererComponent(JList<? extends IPrimitive> list,
+                IPrimitive value, int index, boolean isSelected, boolean cellHasFocus) {
             return super.getListCellRendererComponent(list, value, index, true, false);
         }
@@ -151 +152 @@
             JList<OsmPrimitive> list = new JList<>(toPurgeAdditionally.toArray(new OsmPrimitive[0]));
             /* force selection to be active for all entries */
-            list.setCellRenderer(new SelectionForcedOsmPrimitivRenderer());
+            list.setCellRenderer(new SelectionForcedPrimitiveRenderer());
             JScrollPane scroll = new JScrollPane(list);
             scroll.setPreferredSize(new Dimension(250, 300));