Changeset 18415 in osm for applications/editors/josm/plugins/multipoly

Timestamp:

2009-11-02T08:53:38+01:00 (15 years ago)

Author:

jttt

Message:

Replace Dataset.nodes with getNodes(), etc

Location:

applications/editors/josm/plugins/multipoly

Files:

• .classpath (added)
• .project (added)
• .settings (added)
• build.xml (modified) (1 diff)
• src/multipoly/MultipolyAction.java (modified) (5 diffs)

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

@@ -47 +47 @@
     <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
     <attribute name="Plugin-Link" value="http://svn.openstreetmap.org/applications/editors/josm/plugins/multipoly/"/>
-    <attribute name="Plugin-Mainversion" value="2267"/>
+    <attribute name="Plugin-Mainversion" value="2381"/>
    </manifest>
   </jar>

applications/editors/josm/plugins/multipoly/src/multipoly/MultipolyAction.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.event.*;
-import java.util.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.KeyEvent;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.command.*;
+import org.openstreetmap.josm.command.AddCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.osm.*;
-import org.openstreetmap.josm.tools.*;
+import org.openstreetmap.josm.data.osm.Node;
+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.tools.Pair;
+import org.openstreetmap.josm.tools.Shortcut;
 
 /**
  * Create multipolygon from selected ways automatically.
- * 
+ *
  * New relation with type=multipolygon is created
- * 
+ *
  * If one or more of ways is already in relation with type=multipolygon or the way os not closed,
  * then error is reported and no relation is created
- * 
+ *
  * The "inner" and "outer" roles are guessed automatically.
  * First, bbox is calculated for each way. then the largest area is assumed to be outside
@@ -39 +51 @@
   setEnabled(true);
  }
- 
+
  /**
   * The action button has been clicked
@@ -48 +60 @@
   // Get all ways in some type=multipolygon relation
   HashSet<OsmPrimitive> relationsInMulti = new HashSet<OsmPrimitive>();
-  for (Relation r : Main.main.getCurrentDataSet().relations) {
+  for (Relation r : Main.main.getCurrentDataSet().getRelations()) {
    if (!r.isUsable()) continue;
    if (r.get("type")!="multipolygon") continue;
@@ -60 +72 @@
 
   //List of selected ways
-  List<Way> selectedWays = new ArrayList<Way>();;
+  List<Way> selectedWays = new ArrayList<Way>();
   //Area of largest way (in square degrees)
   double maxarea=0;
@@ -118 +130 @@
   rel.put("type","multipolygon");
   //Add ways to it
-  for (int i=0;i<selectedWays.size();i++) { 
+  for (int i=0;i<selectedWays.size();i++) {
    Way s=selectedWays.get(i);
    String xrole="inner";