Changeset 7392 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2014-08-14T11:27:38+02:00 (10 years ago)

Author:

Don-vip

Message:

code cleanup, javadoc update

File:

• trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java

@@ -27 +27 @@
 import org.openstreetmap.josm.command.Command;
 import org.openstreetmap.josm.command.SequenceCommand;
-import org.openstreetmap.josm.data.osm.MultipolygonCreate;
-import org.openstreetmap.josm.data.osm.MultipolygonCreate.JoinedPolygon;
+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;
@@ -191 +191 @@
         ways.addAll(selectedMultipolygonRelation.getMemberPrimitives(Way.class));
 
-        final MultipolygonCreate polygon = analyzeWays(ways, true);
+        final MultipolygonBuilder polygon = analyzeWays(ways, true);
         if (polygon == null) {
             return null; //could not make multipolygon.
@@ -204 +204 @@
     public static Pair<Relation, Relation> createMultipolygonRelation(Collection<Way> selectedWays, boolean showNotif) {
 
-        final MultipolygonCreate polygon = analyzeWays(selectedWays, showNotif);
+        final MultipolygonBuilder polygon = analyzeWays(selectedWays, showNotif);
         if (polygon == null) {
             return null; //could not make multipolygon.
@@ -265 +265 @@
      * @return <code>null</code>, if there was a problem with the ways.
      */
-    private static MultipolygonCreate analyzeWays(Collection < Way > selectedWays, boolean showNotif) {
-
-        MultipolygonCreate pol = new MultipolygonCreate();
+    private static MultipolygonBuilder analyzeWays(Collection < Way > selectedWays, boolean showNotif) {
+
+        MultipolygonBuilder pol = new MultipolygonBuilder();
         String error = pol.makeFromWays(selectedWays);
 
@@ -287 +287 @@
      * @return multipolygon relation
      */
-    private static Relation createRelation(MultipolygonCreate pol, final Relation rel) {
+    private static Relation createRelation(MultipolygonBuilder pol, final Relation rel) {
         // Create new relation
         rel.put("type", "multipolygon");