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

Timestamp:

2018-05-21T20:31:36+02:00 (6 years ago)

Author:

Don-vip

Message:

define InterestingTags functions in IPrimitive

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/tags/CombinePrimitiveResolver.java (modified) (2 diffs)
• conflict/tags/TagConflictResolutionUtil.java (modified) (2 diffs)
• dialogs/properties/PropertiesCellRenderer.java (modified) (2 diffs)
• dialogs/properties/PropertiesDialog.java (modified) (2 diffs)

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

@@ -7 +7 @@
 import org.openstreetmap.josm.command.ChangePropertyCommand;
 import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.TagCollection;
@@ -41 +42 @@
             cmds.addAll(buildTagChangeCommand(targetPrimitive, allResolutions));
         }
-        for (String p : OsmPrimitive.getDiscardableKeys()) {
+        for (String p : AbstractPrimitive.getDiscardableKeys()) {
             if (targetPrimitive.get(p) != null) {
                 cmds.add(new ChangePropertyCommand(targetPrimitive, p, null));

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

@@ -17 +17 @@
 import org.openstreetmap.josm.data.StructUtils;
 import org.openstreetmap.josm.data.StructUtils.StructEntry;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Tag;
@@ -101 +102 @@
         // remove irrelevant tags
         //
-        for (String key : OsmPrimitive.getDiscardableKeys()) {
+        for (String key : AbstractPrimitive.getDiscardableKeys()) {
             tc.removeByKey(key);
         }

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesCellRenderer.java

@@ -21 +21 @@
 import javax.swing.table.TableCellRenderer;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.preferences.CachingProperty;
@@ -52 +52 @@
     private static void setColors(Component c, String key, boolean isSelected) {
 
-        if (OsmPrimitive.getDiscardableKeys().contains(key)) {
+        if (AbstractPrimitive.getDiscardableKeys().contains(key)) {
             c.setForeground((isSelected ? SELECTED_FG : NORMAL_FG).get());
             c.setBackground((isSelected ? SELECTED_BG : NORMAL_BG).get());

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -60 +60 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.data.SelectionChangedListener;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DefaultNameFormatter;
@@ -580 +581 @@
             types.add(TaggingPresetType.forPrimitive(osm));
             for (String key : osm.keySet()) {
-                if (displayDiscardableKeys || !OsmPrimitive.getDiscardableKeys().contains(key)) {
+                if (displayDiscardableKeys || !AbstractPrimitive.getDiscardableKeys().contains(key)) {
                     String value = osm.get(key);
                     keyCount.put(key, keyCount.containsKey(key) ? keyCount.get(key) + 1 : 1);