Changeset 30587 in osm for applications/editors/josm

Timestamp:

2014-08-15T18:02:25+02:00 (10 years ago)

Author:

donvip

Message:

[josm_reltoolbox] update to JOSM 7392

Location:

applications/editors/josm/plugins/reltoolbox

Files:

• build.xml (modified) (1 diff)
• src/relcontext/actions/CreateMultipolygonAction.java (modified) (2 diffs)
• src/relcontext/actions/ReconstructPolygonAction.java (modified) (2 diffs)
• src/relcontext/relationfix/MultipolygonFixer.java (modified) (3 diffs)

applications/editors/josm/plugins/reltoolbox/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="RelToolbox: make natural sort for relation and find relation lists"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="7001"/>
+    <property name="plugin.main.version" value="7392"/>
 
     <property name="plugin.author" value="Ilya Zverev"/>

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/CreateMultipolygonAction.java

@@ -88 +88 @@
 
         // for now, just copying standard action
-        MultipolygonCreate mpc = new MultipolygonCreate();
+        MultipolygonBuilder mpc = new MultipolygonBuilder();
         String error = mpc.makeFromWays(getCurrentDataSet().getSelectedWays());
         if( error != null ) {
@@ -100 +100 @@
         } else
             rel.put("type", "multipolygon");
-        for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
+        for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays )
             for( Way w : poly.ways )
                 rel.addMember(new RelationMember("outer", w));
-        for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
+        for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays )
             for( Way w : poly.ways )
                 rel.addMember(new RelationMember("inner", w));

applications/editors/josm/plugins/reltoolbox/src/relcontext/actions/ReconstructPolygonAction.java

@@ -2 +2 @@
 
 import static org.openstreetmap.josm.tools.I18n.tr;
+
 import java.awt.event.ActionEvent;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
 import javax.swing.AbstractAction;
 import javax.swing.JOptionPane;
+
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.*;
-import org.openstreetmap.josm.data.osm.*;
-import org.openstreetmap.josm.data.osm.MultipolygonCreate.JoinedPolygon;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.DeleteCommand;
+import org.openstreetmap.josm.command.SequenceCommand;
+import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
+import org.openstreetmap.josm.data.osm.MultipolygonBuilder.JoinedPolygon;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.gui.DefaultNameFormatter;
 import org.openstreetmap.josm.tools.ImageProvider;
+
 import relcontext.ChosenRelation;
 import relcontext.ChosenRelationListener;
@@ -49 +68 @@
         }
         
-        MultipolygonCreate mpc = new MultipolygonCreate();
+        MultipolygonBuilder mpc = new MultipolygonBuilder();
         String error = mpc.makeFromWays(ways);
         if( error != null ) {

applications/editors/josm/plugins/reltoolbox/src/relcontext/relationfix/MultipolygonFixer.java

@@ -10 +10 @@
 import org.openstreetmap.josm.command.ChangeCommand;
 import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.data.osm.MultipolygonCreate;
+import org.openstreetmap.josm.data.osm.MultipolygonBuilder;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
@@ -56 +56 @@
             if( p instanceof Way )
                 ways.add((Way)p);
-        MultipolygonCreate mpc = new MultipolygonCreate();
+        MultipolygonBuilder mpc = new MultipolygonBuilder();
         String error = mpc.makeFromWays(ways);
         if( error != null )
@@ -64 +64 @@
         boolean fixed = false;
         Set<Way> outerWays = new HashSet<Way>();
-        for( MultipolygonCreate.JoinedPolygon poly : mpc.outerWays )
+        for( MultipolygonBuilder.JoinedPolygon poly : mpc.outerWays )
             for( Way w : poly.ways )
                 outerWays.add(w);
         Set<Way> innerWays = new HashSet<Way>();
-        for( MultipolygonCreate.JoinedPolygon poly : mpc.innerWays )
+        for( MultipolygonBuilder.JoinedPolygon poly : mpc.innerWays )
             for( Way w : poly.ways )
                 innerWays.add(w);