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

Timestamp:

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

Author:

jttt

Message:

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

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• CombineWayAction.java (modified) (1 diff)
• SplitWayAction.java (modified) (8 diffs)
• UnGlueAction.java (modified) (6 diffs)
• UpdateSelectionAction.java (modified) (1 diff)
• UploadSelectionAction.java (modified) (1 diff)
• downloadtasks/DownloadOsmTaskList.java (modified) (8 diffs)
• mapmode/DrawAction.java (modified) (1 diff)

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

@@ -250 +250 @@
          */
         public void build(DataSet ds) {
-            for (Relation r: ds.relations) {
+            for (Relation r : ds.getRelations()) {
                 if (!r.isUsable()) {
                     continue;

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,

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

@@ -67 +67 @@
         if (checkSelection(selection)) {
             int count = 0;
-            for (Way w : getCurrentDataSet().ways) {
+            for (Way w : getCurrentDataSet().getWays()) {
                 if (!w.isUsable() || w.getNodesCount() < 1) {
                     continue;
@@ -79 +79 @@
                 // If there aren't enough ways, maybe the user wanted to unglue the nodes
                 // (= copy tags to a new node)
-                if(checkForUnglueNode(selection)) {
+                if (checkForUnglueNode(selection)) {
                     unglueNode(e);
                 } else {
@@ -92 +92 @@
             for (Node n : selectedNodes) {
                 int count = 0;
-                for (Way w : getCurrentDataSet().ways) {
+                for (Way w : getCurrentDataSet().getWays()) {
                     if (w.isDeleted() || w.incomplete || w.getNodesCount() < 1) {
                         continue;
@@ -185 +185 @@
      */
     private boolean checkForUnglueNode(Collection<? extends OsmPrimitive> selection) {
-        if(selection.size() != 1)
+        if (selection.size() != 1)
             return false;
         OsmPrimitive n = (OsmPrimitive) selection.toArray()[0];
-        if(!(n instanceof Node))
+        if (!(n instanceof Node))
             return false;
         boolean isPartOfWay = false;
-        for(Way w : getCurrentDataSet().ways) {
-            if(w.containsNode((Node)n)) {
+        for (Way w : getCurrentDataSet().getWays()) {
+            if (w.containsNode((Node) n)) {
                 isPartOfWay = true;
                 break;
             }
         }
-        if(!isPartOfWay)
-            return false;
-
-        selectedNode = (Node)n;
-        return  selectedNode.isTagged();
+        if (!isPartOfWay)
+            return false;
+
+        selectedNode = (Node) n;
+        return selectedNode.isTagged();
     }
 
@@ -322 +322 @@
         Relation newRel = null;
         HashSet<String> rolesToReAdd = null;
-        for (Relation r : getCurrentDataSet().relations) {
+        for (Relation r : getCurrentDataSet().getRelations()) {
             if (r.isDeleted() || r.incomplete) {
                 continue;
@@ -367 +367 @@
             boolean firstway = true;
             // modify all ways containing the nodes
-            for (Way w : getCurrentDataSet().ways) {
+            for (Way w : getCurrentDataSet().getWays()) {
                 if (w.isDeleted() || w.incomplete || w.getNodesCount() < 1) {
                     continue;

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

@@ -219 +219 @@
                 // incomplete ways.
                 //
-                for (Way w: ds.ways) {
+                for (Way w : ds.getWays()) {
                     if (w.incomplete) {
                         OsmServerObjectReader reader = new OsmServerObjectReader(w.getId(), OsmPrimitiveType.WAY, true /* full */);

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

@@ -68 +68 @@
     protected Set<OsmPrimitive> getDeletedPrimitives(DataSet ds) {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
-        for (OsmPrimitive p : ds.nodes) {
+        for (OsmPrimitive p : ds.getNodes()) {
             if (p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified()) {
                 ret.add(p);
             }
         }
-        for (OsmPrimitive p : ds.ways) {
+        for (OsmPrimitive p : ds.getWays()) {
             if (p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified()) {
                 ret.add(p);
             }
         }
-        for (OsmPrimitive p : ds.relations) {
+        for (OsmPrimitive p : ds.getRelations()) {
             if (p.isDeleted() && !p.isNew() && p.isVisible() && p.isModified()) {
                 ret.add(p);

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java

@@ -2 +2 @@
 package org.openstreetmap.josm.actions.downloadtasks;
 
+import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
-import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 
 import java.awt.EventQueue;
@@ -106 +106 @@
     protected Set<OsmPrimitive> getCompletePrimitives(DataSet ds) {
         HashSet<OsmPrimitive> ret = new HashSet<OsmPrimitive>();
-        for (OsmPrimitive primitive : ds.nodes) {
+        for (OsmPrimitive primitive : ds.getNodes()) {
             if (!primitive.incomplete && !primitive.isNew()) {
                 ret.add(primitive);
             }
         }
-        for (OsmPrimitive primitive : ds.ways) {
+        for (OsmPrimitive primitive : ds.getWays()) {
             if (!primitive.incomplete && !primitive.isNew()) {
                 ret.add(primitive);
             }
         }
-        for (OsmPrimitive primitive : ds.relations) {
+        for (OsmPrimitive primitive : ds.getRelations()) {
             if (!primitive.incomplete && !primitive.isNew()) {
                 ret.add(primitive);
@@ -155 +155 @@
         ButtonSpec[] options = new ButtonSpec[] {
                 new ButtonSpec(
-                        tr("Check on the server"), 
+                        tr("Check on the server"),
                         ImageProvider.get("ok"),
-                        tr("Click to check whether objects in your local dataset are deleted on the server"), 
+                        tr("Click to check whether objects in your local dataset are deleted on the server"),
                         null  /* no specific help topic */
-                ), 
+                ),
                 new ButtonSpec(
-                        tr("Ignore"), 
-                        ImageProvider.get("cancel"), 
-                        tr("Click to abort and to resume editing"), 
+                        tr("Ignore"),
+                        ImageProvider.get("cancel"),
+                        tr("Click to abort and to resume editing"),
                         null /* no specific help topic */
                 ),
@@ -172 +172 @@
                 + "update them the server is likely to report a<br>" + "conflict.<br>" + "<br>"
                 + "Click <strong>{1}</strong> to check the state of these primitives<br>" + "on the server.<br>"
-                + "Click <strong>{2}</strong> to ignore.<br>" + "</html>", 
-                potentiallyDeleted.size(), 
+                + "Click <strong>{2}</strong> to ignore.<br>" + "</html>",
+                potentiallyDeleted.size(),
                 options[0].text,
                 options[1].text
-                );
+        );
 
         int ret = HelpAwareOptionPane.showOptionDialog(
-                Main.parent, 
-                message, 
+                Main.parent,
+                message,
                 tr("Deleted or moved primitives"),
-                JOptionPane.WARNING_MESSAGE, 
-                null, 
-                options, 
+                JOptionPane.WARNING_MESSAGE,
+                null,
+                options,
                 options[0],
                 ht("/Action/UpdateData#SyncPotentiallyDeletedObjects")
@@ -190 +190 @@
         if (ret != 0 /* OK */)
             return;
-        
-        updatePotentiallyDeletedPrimitives(potentiallyDeleted);        
+
+        updatePotentiallyDeletedPrimitives(potentiallyDeleted);
     }
 
@@ -205 +205 @@
                 DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
                 if (ds != null) {
-                    ret.addAll(ds.nodes);
-                    ret.addAll(ds.ways);
-                    ret.addAll(ds.relations);
+                    ret.addAll(ds.getNodes());
+                    ret.addAll(ds.getWays());
+                    ret.addAll(ds.getRelations());
                 }
             }
@@ -242 +242 @@
                     } else if (error instanceof Exception) {
                         sb.append("<li>").append(ExceptionUtil.explainException((Exception) error)).append("</li>")
-                                .append("<br>");
+                        .append("<br>");
                     }
                 }
@@ -272 +272 @@
                         DataSet ds = ((DownloadOsmTask) task).getDownloadedData();
                         if (ds != null) {
-                            myPrimitives.removeAll(ds.nodes);
-                            myPrimitives.removeAll(ds.ways);
-                            myPrimitives.removeAll(ds.relations);
+                            myPrimitives.removeAll(ds.getNodes());
+                            myPrimitives.removeAll(ds.getWays());
+                            myPrimitives.removeAll(ds.getRelations());
                         }
                     }

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -779 +779 @@
     public Way getWayForNode(Node n) {
         Way way = null;
-        for (Way w : getCurrentDataSet().ways) {
+        for (Way w : getCurrentDataSet().getWays()) {
             if (!w.isUsable() || w.getNodesCount() < 1) {
                 continue;