Changeset 14306 in josm for trunk

Timestamp:

2018-10-08T01:00:47+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16816 - new option to show object version in lists, similar to object ID

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/DefaultNameFormatter.java (modified) (1 diff)
• gui/preferences/display/LafPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DefaultNameFormatter.java

@@ -113 +113 @@
 
     /**
-     * Decorates the name of primitive with its id, if the preference
-     * <code>osm-primitives.showid</code> is set. Shows unique id if osm-primitives.showid.new-primitives is set
-     *
-     * @param name  the name without the id
+     * Decorates the name of primitive with its id and version, if the preferences
+     * <code>osm-primitives.showid</code> and <code>osm-primitives.showversion</code> are set.
+     * Shows unique id if <code>osm-primitives.showid.new-primitives</code> is set
+     *
+     * @param name the name without the id
      * @param primitive the primitive
      */
     protected void decorateNameWithId(StringBuilder name, IPrimitive primitive) {
         if (Config.getPref().getBoolean("osm-primitives.showid")) {
-            if (Config.getPref().getBoolean("osm-primitives.showid.new-primitives")) {
-                name.append(tr(" [id: {0}]", primitive.getUniqueId()));
+            long id = Config.getPref().getBoolean("osm-primitives.showid.new-primitives") ?
+                    primitive.getUniqueId() : primitive.getId();
+            if (Config.getPref().getBoolean("osm-primitives.showversion")) {
+                name.append(tr(" [id: {0}, v{1}]", id, primitive.getVersion()));
             } else {
-                name.append(tr(" [id: {0}]", primitive.getId()));
-            }
+                name.append(tr(" [id: {0}]", id));
+            }
+        } else if (Config.getPref().getBoolean("osm-primitives.showversion")) {
+            name.append(tr(" [v{0}]", primitive.getVersion()));
         }
     }

trunk/src/org/openstreetmap/josm/gui/preferences/display/LafPreference.java

@@ -82 +82 @@
     private final JCheckBox showSplashScreen = new JCheckBox(tr("Show splash screen at startup"));
     private final JCheckBox showID = new JCheckBox(tr("Show object ID in selection lists"));
+    private final JCheckBox showVersion = new JCheckBox(tr("Show object version in selection lists"));
     private final JCheckBox showCoor = new JCheckBox(tr("Show node coordinates in selection lists"));
     private final JCheckBox showLocalizedName = new JCheckBox(tr("Show localized name in selection lists"));
@@ -133 +134 @@
         showID.setSelected(Config.getPref().getBoolean("osm-primitives.showid", false));
 
+        // Show version in selection
+        showVersion.setToolTipText(tr("Show object version in selection lists"));
+        showVersion.setSelected(Config.getPref().getBoolean("osm-primitives.showversion", false));
+
         // Show Coordinates in selection
         showCoor.setToolTipText(tr("Show node coordinates in selection lists"));
@@ -147 +152 @@
 
         panel.add(showID, GBC.eop().insets(20, 0, 0, 0));
+        panel.add(showVersion, GBC.eop().insets(20, 0, 0, 0));
         panel.add(showCoor, GBC.eop().insets(20, 0, 0, 0));
         panel.add(showLocalizedName, GBC.eop().insets(20, 0, 0, 0));
@@ -211 +217 @@
         Config.getPref().putBoolean("draw.splashscreen", showSplashScreen.isSelected());
         Config.getPref().putBoolean("osm-primitives.showid", showID.isSelected());
+        Config.getPref().putBoolean("osm-primitives.showversion", showVersion.isSelected());
         Config.getPref().putBoolean("osm-primitives.showcoor", showCoor.isSelected());
         Config.getPref().putBoolean("osm-primitives.localize-name", showLocalizedName.isSelected());