Changeset 34326 in osm

Timestamp:

2018-06-19T23:32:13+02:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 13957

Location:

applications/editors/josm/plugins/imagery-xml-bounds

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java (modified) (6 diffs)
• src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery-xml-bounds/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="13927"/>
+    <property name="plugin.main.version" value="13957"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ComputeBoundsAction.java

@@ -25 +25 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
+import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.data.osm.IRelation;
+import org.openstreetmap.josm.data.osm.IRelationMember;
+import org.openstreetmap.josm.data.osm.IWay;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
@@ -51 +55 @@
     protected static final String EIGHT_SP = "        ";
 
-    private final Set<Relation> multipolygons;
-    private final Set<Way> closedWays;
+    private final Set<IRelation<?>> multipolygons;
+    private final Set<IWay<?>> closedWays;
 
     static { DF.setRoundingMode(RoundingMode.CEILING); }
@@ -83 +87 @@
     }
 
-    protected void updateOsmPrimitives(Collection<? extends OsmPrimitive> primitives) {
+    protected void updateOsmPrimitives(Collection<? extends IPrimitive> primitives) {
         multipolygons.clear();
         closedWays.clear();
         // Store selected multipolygons and closed ways
-        for (OsmPrimitive value : primitives) {
-            if (value instanceof Relation) {
-                Relation r = (Relation) value;
+        for (IPrimitive value : primitives) {
+            if (value instanceof IRelation) {
+                IRelation<?> r = (IRelation<?>) value;
                 if (r.isMultipolygon()) {
                     multipolygons.add(r);
                 }
-            } else if (value instanceof Way) {
-                Way w = (Way) value;
+            } else if (value instanceof IWay) {
+                IWay<?> w = (IWay<?>) value;
                 if (w.isClosed()) {
                     closedWays.add(w);
@@ -101 +105 @@
         }
         // Remove closed ways already inside a selected multipolygon
-        for (Iterator<Way> it = closedWays.iterator(); it.hasNext();) {
+        for (Iterator<IWay<?>> it = closedWays.iterator(); it.hasNext();) {
             processIterator(it);
         }
@@ -108 +112 @@
     }
 
-    private void processIterator(Iterator<Way> it) {
-        Way way = it.next();
-        for (Relation mp : multipolygons) {
-            for (RelationMember mb : mp.getMembers()) {
+    private void processIterator(Iterator<IWay<?>> it) {
+        IWay<?> way = it.next();
+        for (IRelation<?> mp : multipolygons) {
+            for (IRelationMember<?> mb : mp.getMembers()) {
                 if (mb.getMember().equals(way)) {
                     it.remove();
@@ -125 +129 @@
      */
     public final String getXml() {
-        List<OsmPrimitive> primitives = new ArrayList<>();
+        List<IPrimitive> primitives = new ArrayList<>();
         primitives.addAll(multipolygons);
         primitives.addAll(closedWays);

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/ShowBoundsAction.java

@@ -11 +11 @@
 import javax.swing.JScrollPane;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.IPrimitiveAction;
+import org.openstreetmap.josm.data.osm.IPrimitive;
+import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
+
 import net.boplicity.xmleditor.XmlTextPane;
-
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.OsmPrimitiveAction;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.plugins.imageryxmlbounds.XmlBoundsLayer;
 
 /**
@@ -22 +22 @@
  * @author Don-vip
  */
-public class ShowBoundsAction extends ComputeBoundsAction implements OsmPrimitiveAction {
+public class ShowBoundsAction extends ComputeBoundsAction implements IPrimitiveAction {
 
     /**
@@ -55 +55 @@
 
     @Override
-    public void setPrimitives(Collection<? extends OsmPrimitive> primitives) {
+    public void setPrimitives(Collection<? extends IPrimitive> primitives) {
         updateOsmPrimitives(primitives);
     }