Changeset 1682 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-06-20T09:31:00+02:00 (15 years ago)

Author:

Gubaer

Message:

removed old conflict resolution code
fixed bug in OsmApi (missing changeset initialization)

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (1 diff)
• OsmServerWriter.java (modified) (3 diffs)

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

@@ -307 +307 @@
      * @return list of processed primitives
      * @throws OsmTransferException if something is wrong
-     * @throws OsmTransferCancelledException  if the upload was cancelled by the user
      */
     public Collection<OsmPrimitive> uploadDiff(final Collection<OsmPrimitive> list) throws OsmTransferException {

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

@@ -84 +84 @@
         processed = new LinkedList<OsmPrimitive>();
 
-        // initialize API. Abort upload in case of configuration or network
-        // errors
-        //
-        try {
-            api.initialize();
-        } catch(Exception e) {
-            throw new OsmApiInitializationException(e);
-        }
+        api.initialize();
 
         Main.pleaseWaitDlg.progress.setMaximum(primitives.size());
@@ -125 +118 @@
             // upload changes individually (90% of code is for the status display...)
             //
+            api.createChangeset(getChangesetComment());
             NameVisitor v = new NameVisitor();
             uploadStartTime = System.currentTimeMillis();
@@ -139 +133 @@
                 Main.pleaseWaitDlg.progress.setValue(progress+1);
             }
+            api.stopChangeset();
         }
     }