Changeset 13564 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs

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.

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• ConflictDialog.java (modified) (2 diffs)
• DeleteFromRelationConfirmationDialog.java (modified) (3 diffs)
• RelationListDialog.java (modified) (3 diffs)
• SelectionListDialog.java (modified) (2 diffs)
• changeset/ChangesetContentTableCellRenderer.java (modified) (1 diff)
• changeset/ChangesetContentTableColumnModel.java (modified) (2 diffs)
• relation/ReferringRelationsBrowser.java (modified) (2 diffs)

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

@@ -57 +57 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
@@ -127 +127 @@
             lstConflicts = new JList<>(model);
             lstConflicts.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-            lstConflicts.setCellRenderer(new OsmPrimitivRenderer());
+            lstConflicts.setCellRenderer(new PrimitiveRenderer());
             lstConflicts.addMouseListener(new MouseEventHandler());
         }

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

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.RelationToChildReference;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
 import org.openstreetmap.josm.gui.help.HelpUtil;
@@ -296 +296 @@
             col.setWidth(100);
             col.setPreferredWidth(100);
-            col.setCellRenderer(new OsmPrimitivRenderer());
+            col.setCellRenderer(new PrimitiveRenderer());
             addColumn(col);
 
@@ -305 +305 @@
             col.setWidth(100);
             col.setPreferredWidth(100);
-            col.setCellRenderer(new OsmPrimitivRenderer());
+            col.setCellRenderer(new PrimitiveRenderer());
             addColumn(col);
 

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

@@ -49 +49 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -66 +67 @@
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.NavigatableComponent;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.dialogs.relation.RelationEditor;
@@ -322 +323 @@
     }
 
-    static final class NoTooltipOsmRenderer extends OsmPrimitivRenderer {
-        @Override
-        protected String getComponentToolTipText(OsmPrimitive value) {
+    static final class NoTooltipOsmRenderer extends PrimitiveRenderer {
+        @Override
+        protected String getComponentToolTipText(IPrimitive value) {
             // Don't show the default tooltip in the relation list
             return null;

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

@@ -65 +65 @@
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
@@ -113 +113 @@
         lstPrimitives.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
         lstPrimitives.setSelectionModel(selectionModel);
-        lstPrimitives.setCellRenderer(new OsmPrimitivRenderer());
+        lstPrimitives.setCellRenderer(new PrimitiveRenderer());
         lstPrimitives.setTransferHandler(new SelectionTransferHandler());
         if (!GraphicsEnvironment.isHeadless()) {

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableCellRenderer.java

@@ -13 +13 @@
 /**
  * The table cell renderer used in the changeset content table, except for the "name"
- * column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
+ * column in which we use a {@link org.openstreetmap.josm.gui.PrimitiveRenderer}.
  */
 public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetContentTableColumnModel.java

@@ -7 +7 @@
 import javax.swing.table.TableColumn;
 
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 
 /**
@@ -48 +48 @@
         col.setResizable(true);
         col.setPreferredWidth(200);
-        col.setCellRenderer(new OsmPrimitivRenderer());
+        col.setCellRenderer(new PrimitiveRenderer());
         addColumn(col);
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java

@@ -24 +24 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.gui.MainApplication;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.gui.progress.swing.PleaseWaitProgressMonitor;
@@ -59 +59 @@
         setLayout(new BorderLayout());
         referrers = new JList<>(model);
-        referrers.setCellRenderer(new OsmPrimitivRenderer());
+        referrers.setCellRenderer(new PrimitiveRenderer());
         add(new JScrollPane(referrers), BorderLayout.CENTER);
         referrers.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);