Changeset 2381 in josm for trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java

Timestamp:

2009-11-02T07:51:28+01:00 (14 years ago)

Author:

jttt

Message:

Change most occurrences of Dataset.nodes/ways/relations with getNodes()/../.. or addPrimitive

File:

• trunk/src/org/openstreetmap/josm/actions/SplitWayAction.java (modified) (8 diffs)

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

@@ -103 +103 @@
             HashMap<Way, Integer> wayOccurenceCounter = new HashMap<Way, Integer>();
             for (Node n : selectedNodes) {
-                for (Way w : getCurrentDataSet().ways) {
+                for (Way w : getCurrentDataSet().getWays()) {
                     if (!w.isUsable()) {
                         continue;
                     }
-                    int last = w.getNodesCount()-1;
-                    if(last <= 0) {
+                    int last = w.getNodesCount() - 1;
+                    if (last <= 0) {
                         continue; // zero or one node ways
                     }
@@ -116 +116 @@
                         if ((circular || (i > 0 && i < last)) && n.equals(wn)) {
                             Integer old = wayOccurenceCounter.get(w);
-                            wayOccurenceCounter.put(w, (old == null) ? 1 : old+1);
+                            wayOccurenceCounter.put(w, (old == null) ? 1 : old + 1);
                             break;
                         }
@@ -248 +248 @@
 
         if (wayChunks.size() < 2) {
-            if(wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size()-1)) {
+            if (wayChunks.get(0).get(0) == wayChunks.get(0).get(wayChunks.get(0).size() - 1)) {
                 JOptionPane.showMessageDialog(
                         Main.parent,
@@ -290 +290 @@
 
         }
-        Boolean warnmerole=false;
-        Boolean warnme=false;
+        Boolean warnmerole = false;
+        Boolean warnme = false;
         // now copy all relations to new way also
 
-        for (Relation r : getCurrentDataSet().relations) {
+        for (Relation r : getCurrentDataSet().getRelations()) {
             if (!r.isUsable()) {
                 continue;
@@ -307 +307 @@
             for (RelationMember rm : r.getMembers()) {
                 if (rm.isWay()) {
-                    if (rm.getMember() == selectedWay)
-                    {
-                        if(!("route".equals(type)) && !("multipolygon".equals(type))) {
+                    if (rm.getMember() == selectedWay) {
+                        if (!("route".equals(type)) && !("multipolygon".equals(type))) {
                             warnme = true;
                         }
@@ -318 +317 @@
                         int j = i;
                         boolean backwards = "backward".equals(rm.getRole());
-                        for(Way wayToAdd : newWays)
-                        {
+                        for (Way wayToAdd : newWays) {
                             RelationMember em = new RelationMember(rm.getRole(), wayToAdd);
-                            if(em.hasRole() && !("multipolygon".equals(type))) {
+                            if (em.hasRole() && !("multipolygon".equals(type))) {
                                 warnmerole = true;
                             }
@@ -342 +340 @@
             }
         }
-        if(warnmerole) {
+        if (warnmerole) {
             JOptionPane.showMessageDialog(
                     Main.parent,
@@ -348 +346 @@
                     tr("Warning"),
                     JOptionPane.WARNING_MESSAGE);
-        } else if(warnme) {
+        } else if (warnme) {
             JOptionPane.showMessageDialog(
                     Main.parent,