Changeset 2081 in josm for trunk/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java

Timestamp:

08.09.2009 22:56:02 (3 years ago)

Author:

Gubaer

Message:

fixed #3393: loooong delay when using presets with a large osm file - further improvement; next step could be to turn UploadHooks into an asynchronous task; ApiPreconditionChecker loops over all keys in all upload primitives!
fixed #3435: Switching the changeset type deletes any changeset tags that have been set
fixed #3430: Entering comment=* manually in the changeset tags dialog gets ignored
fixed #3431: Upload dialog pops up again if no comment is provided
fixed #3429: created_by=* includes the wrong language when uploading from a new layer

File:

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

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

@@ -4 +4 @@
 
 import java.util.Collection;
-import java.util.LinkedList;
-import java.util.List;
+import java.util.Collections;
 import java.util.Map.Entry;
 
@@ -12 +11 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.UploadAction.UploadHook;
+import org.openstreetmap.josm.data.APIDataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Way;
@@ -21 +21 @@
 public class ApiPreconditionChecker implements UploadHook {
 
-    public boolean checkUpload(Collection<OsmPrimitive> add, Collection<OsmPrimitive> update,
-            Collection<OsmPrimitive> delete) {
+    public boolean checkUpload(APIDataSet apiData) {
         OsmApi api = OsmApi.getOsmApi();
         try {
@@ -36 +35 @@
 
             if (maxNodes > 0) {
-                if( !checkMaxNodes(add, maxNodes))
+                if( !checkMaxNodes(apiData.getPrimitivesToAdd(), maxNodes))
                     return false;
-                if( !checkMaxNodes(update, maxNodes))
+                if( !checkMaxNodes(apiData.getPrimitivesToUpdate(), maxNodes))
                     return false;
-                if( !checkMaxNodes(delete, maxNodes))
+                if( !checkMaxNodes(apiData.getPrimitivesToDelete(), maxNodes))
                     return false;
             }
@@ -46 +45 @@
             if (maxElements  > 0) {
                 int total = 0;
-                total = add.size() + update.size() + delete.size();
+                total = apiData.getPrimitivesToAdd().size() + apiData.getPrimitivesToUpdate().size() + apiData.getPrimitivesToDelete().size();
                 if(total > maxElements) {
                     JOptionPane.showMessageDialog(
@@ -67 +66 @@
     }
 
-    private boolean checkMaxNodes(Collection<OsmPrimitive> add, long maxNodes) {
-        for (OsmPrimitive osmPrimitive : add) {
+    private boolean checkMaxNodes(Collection<OsmPrimitive> primitives, long maxNodes) {
+        for (OsmPrimitive osmPrimitive : primitives) {
             for (Entry<String,String> e : osmPrimitive.entrySet()) {
                 if(e.getValue().length() > 255) {
@@ -90 +89 @@
                             JOptionPane.ERROR_MESSAGE
                     );
-                    List<OsmPrimitive> newNodes = new LinkedList<OsmPrimitive>();
-                    newNodes.add(osmPrimitive);
-                    Main.main.getCurrentDataSet().setSelected(newNodes);
+                    Main.main.getCurrentDataSet().setSelected(Collections.singleton(osmPrimitive));
                     return false;
                 }
@@ -109 +106 @@
                         JOptionPane.ERROR_MESSAGE
                 );
-                List<OsmPrimitive> newNodes = new LinkedList<OsmPrimitive>();
-                newNodes.add(osmPrimitive);
-
-                Main.main.getCurrentDataSet().setSelected(newNodes);
+                Main.main.getCurrentDataSet().setSelected(Collections.singleton(osmPrimitive));
                 return false;
             }