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

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

Files:

• OsmPrimitivRenderer.java (modified) (1 diff)
• PrimitiveRenderer.java (added)
• conflict/tags/RelationMemberConflictResolverColumnModel.java (modified) (3 diffs)
• dialogs/ConflictDialog.java (modified) (2 diffs)
• dialogs/DeleteFromRelationConfirmationDialog.java (modified) (3 diffs)
• dialogs/RelationListDialog.java (modified) (3 diffs)
• dialogs/SelectionListDialog.java (modified) (2 diffs)
• dialogs/changeset/ChangesetContentTableCellRenderer.java (modified) (1 diff)
• dialogs/changeset/ChangesetContentTableColumnModel.java (modified) (2 diffs)
• dialogs/relation/ReferringRelationsBrowser.java (modified) (2 diffs)
• io/UploadSelectionDialog.java (modified) (2 diffs)
• io/UploadedObjectsSummaryPanel.java (modified) (2 diffs)
• tagging/presets/TaggingPresetNameTemplateList.java (modified) (2 diffs)
• tagging/presets/TaggingPresetType.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java

@@ -26 +26 @@
  * @author imi
  * @author Frederik Ramm
+ * @deprecated since 13564. Use {@link PrimitiveRenderer} instead
  */
+@Deprecated
 public class OsmPrimitivRenderer implements ListCellRenderer<OsmPrimitive>, TableCellRenderer {
     private final DefaultNameFormatter formatter = DefaultNameFormatter.getInstance();

trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java

@@ -12 +12 @@
 import javax.swing.table.TableColumn;
 
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 import org.openstreetmap.josm.gui.conflict.ConflictColors;
 import org.openstreetmap.josm.gui.conflict.pair.relation.RelationMemberTable;
@@ -22 +22 @@
 public class RelationMemberConflictResolverColumnModel extends DefaultTableColumnModel {
 
-    static final class MemberRenderer extends OsmPrimitivRenderer {
+    static final class MemberRenderer extends PrimitiveRenderer {
         @Override
         public Component getTableCellRendererComponent(JTable table,
@@ -33 +33 @@
     private final DefaultTableCellRenderer defaultTableCellRenderer = new DefaultTableCellRenderer();
 
-    private final transient OsmPrimitivRenderer primitiveRenderer = new MemberRenderer();
+    private final transient PrimitiveRenderer primitiveRenderer = new MemberRenderer();
 
     private final transient TableCellRenderer tableRenderer = (table, value, isSelected, hasFocus, row, column)

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);

trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

@@ -36 +36 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-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;
@@ -196 +196 @@
         protected void init() {
             setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
-            setCellRenderer(new OsmPrimitivRenderer());
+            setCellRenderer(new PrimitiveRenderer());
         }
 

trunk/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java

@@ -18 +18 @@
 
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
+import org.openstreetmap.josm.gui.PrimitiveRenderer;
 
 /**
@@ -52 +52 @@
     protected void build() {
         setLayout(new GridBagLayout());
-        OsmPrimitivRenderer renderer = new OsmPrimitivRenderer();
+        PrimitiveRenderer renderer = new PrimitiveRenderer();
         // initialize the three lists for uploaded primitives, but don't add them to the dialog yet, see setUploadedPrimitives()
         //

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetNameTemplateList.java

@@ -7 +7 @@
 import java.util.List;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.tools.Logging;
 
@@ -52 +52 @@
      * @return the first occurence of preset with template name matching the primitive
      */
-    public TaggingPreset findPresetTemplate(OsmPrimitive primitive) {
+    public TaggingPreset findPresetTemplate(IPrimitive primitive) {
         synchronized (this) {
             for (TaggingPreset t : presetsWithPattern) {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetType.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.tagging.presets;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
 
@@ -49 +49 @@
      * @return the {@code TaggingPresetType} of {@code p}
      */
-    public static TaggingPresetType forPrimitive(OsmPrimitive p) {
+    public static TaggingPresetType forPrimitive(IPrimitive p) {
         return forPrimitiveType(p.getDisplayType());
     }