Changeset 13623 in josm

Timestamp:

2018-04-13T00:07:00+02:00 (6 years ago)

Author:

Don-vip

Message:

more use of IPrimitive instead of OsmPrimitive

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/PrimitiveVisitor.java (modified) (2 diffs)
• gui/tagging/presets/TaggingPreset.java (modified) (3 diffs)
• gui/tagging/presets/TaggingPresets.java (modified) (2 diffs)
• tools/RotationAngle.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/PrimitiveVisitor.java

@@ -13 +13 @@
 
     /**
-     * Visiting call for points.
+     * Visiting call for nodes.
      * @param n The node to inspect.
      */
@@ -19 +19 @@
 
     /**
-     * Visiting call for lines.
+     * Visiting call for ways.
      * @param w The way to inspect.
      */

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

@@ -38 +38 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
@@ -78 +79 @@
  * @since 294
  */
-public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, AdaptableAction, Predicate<OsmPrimitive> {
+public class TaggingPreset extends AbstractAction implements ActiveLayerChangeListener, AdaptableAction, Predicate<IPrimitive> {
 
     public static final int DIALOG_ANSWER_APPLY = 1;
@@ -590 +591 @@
      * @param p the primitive
      * @return {@code true} if this preset matches the primitive
+     * @since 13623 (signature)
      */
     @Override
-    public boolean test(OsmPrimitive p) {
+    public boolean test(IPrimitive p) {
         return matches(EnumSet.of(TaggingPresetType.forPrimitive(p)), p.getKeys(), false);
     }

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

@@ -14 +14 @@
 import javax.swing.JSeparator;
 
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MenuScroller;
@@ -189 +189 @@
      * @param primitive the primitive
      * @return a new collection of all presets matching the given preset.
-     * @see TaggingPreset#test(OsmPrimitive)
-     * @since 9265
-     */
-    public static Collection<TaggingPreset> getMatchingPresets(final OsmPrimitive primitive) {
+     * @see TaggingPreset#test(IPrimitive)
+     * @since 13623 (signature)
+     */
+    public static Collection<TaggingPreset> getMatchingPresets(final IPrimitive primitive) {
         return SubclassFilteredCollection.filter(getTaggingPresets(), preset -> preset.test(primitive));
     }

trunk/src/org/openstreetmap/josm/tools/RotationAngle.java

@@ -4 +4 @@
 import java.util.Locale;
 
+import org.openstreetmap.josm.data.osm.IPrimitive;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -22 +23 @@
     final class WayDirectionRotationAngle implements RotationAngle {
         @Override
-        public double getRotationAngle(OsmPrimitive p) {
+        public double getRotationAngle(IPrimitive p) {
             if (!(p instanceof Node)) {
                 return 0;
@@ -70 +71 @@
 
         @Override
-        public double getRotationAngle(OsmPrimitive p) {
+        public double getRotationAngle(IPrimitive p) {
             return angle;
         }
@@ -111 +112 @@
      * @param p primitive
      * @return rotation angle
+     * @since 13623 (signature)
      */
-    double getRotationAngle(OsmPrimitive p);
+    double getRotationAngle(IPrimitive p);
 
     /**