Changeset 1691 in josm for trunk/src/org/openstreetmap

Timestamp:

2009-06-24T20:42:27+02:00 (16 years ago)

Author:

Gubaer

Message:

#2703: patch (slightly extended) by dmuecke
clean up: few issues in Capabilities and OsmApi

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UploadAction.java (modified) (1 diff)
• io/Capabilities.java (modified) (2 diffs)
• io/OsmApi.java (modified) (2 diffs)
• io/OsmServerWriter.java (modified) (1 diff)

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

@@ -79 +79 @@
         super(tr("Upload to OSM..."), "upload", tr("Upload all changes to the OSM server."),
                 Shortcut.registerShortcut("file:upload", tr("File: {0}", tr("Upload to OSM...")), KeyEvent.VK_U, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);
+
+        /**
+         * Checks server capabilities before upload.
+         */
+        uploadHooks.add(new ApiPreconditionChecker());
 
         /**

trunk/src/org/openstreetmap/josm/io/Capabilities.java

@@ -15 +15 @@
     }
 
-    public boolean isDefind(String element, String attribute) {
+    public boolean isDefined(String element, String attribute) {
         if (! capabilities.containsKey(element)) return false;
         HashMap<String, String> e = capabilities.get(element);
@@ -29 +29 @@
     }
 
-    public Double getDouble(String element, String attribute) {
+    /**
+     * replies the value of configuration item in the capabilities as
+     * double value
+     * 
+     * @param element  the name of the element
+     * @param attribute the name of the attribute
+     * @return the value; null, if the respective configuration item doesn't exist
+     * @throws NumberFormatException  if the value is not a valid double
+     */
+    public Double getDouble(String element, String attribute) throws NumberFormatException {
         String s = get(element, attribute);
         if (s == null) return null;

trunk/src/org/openstreetmap/josm/io/OsmApi.java

@@ -327 +327 @@
 
         String diff = duv.getDocument();
-        String diffresult = sendRequest("POST", "changeset/" + changeset.id + "/upload", diff);
         try {
+            String diffresult = sendRequest("POST", "changeset/" + changeset.id + "/upload", diff);
             DiffResultReader.parseDiffResult(diffresult, list, processed, duv.getNewIdMap(), Main.pleaseWaitDlg);
         } catch(Exception e) {
@@ -496 +496 @@
         );
     }
+
+    /**
+     * returns the API capabilities; null, if the API is not initialized yet
+     * 
+     * @return the API capabilities
+     */
+    public Capabilities getCapabilities() {
+        return capabilities;
+    }
 }

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -112 +112 @@
                     }
                 } catch (Exception ee) {
+                    ee.printStackTrace();
                     // ignore nested exception
                 }