Changeset 13661 in josm for trunk/src/org/openstreetmap

Timestamp:

2018-04-23T01:45:58+02:00 (7 years ago)

Author:

Don-vip

Message:

use of IPrimitive interface

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/styleelement/LabelCompositionStrategy.java

@@ -8 +8 @@
 import java.util.Objects;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
@@ -46 +46 @@
      * if no suitable value could be composed
      */
-    String compose(OsmPrimitive primitive);
+    String compose(IPrimitive primitive);
 
     /**
@@ -59 +59 @@
 
         @Override
-        public String compose(OsmPrimitive primitive) {
+        public String compose(IPrimitive primitive) {
             return defaultLabel;
         }
@@ -104 +104 @@
 
         @Override
-        public String compose(OsmPrimitive primitive) {
+        public String compose(IPrimitive primitive) {
             if (defaultLabelTag == null) return null;
             if (primitive == null) return null;
@@ -246 +246 @@
         }
 
-        private String getPrimitiveName(OsmPrimitive n) {
+        private String getPrimitiveName(IPrimitive n) {
             StringBuilder name = new StringBuilder();
             if (!n.hasKeys()) return null;
@@ -271 +271 @@
 
         @Override
-        public String compose(OsmPrimitive primitive) {
+        public String compose(IPrimitive primitive) {
             if (primitive == null) return null;
             return getPrimitiveName(primitive);