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

Timestamp:

2009-04-06T20:18:48+02:00 (17 years ago)

Author:

framm

Message:

• Major redesign of how JOSM talks to the OSM server. Connections now all go through a new OsmApi class that finds out which version the server uses. JOSM should now be able to handle 0.5 and 0.6 without configuration change. Config options osm-server.version and osm-server.additional-versions now obsolete. Handling of error and cancel situations might still need some improvement.

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• DiffResultReader.java (modified) (6 diffs)
• MirroredInputStream.java (modified) (4 diffs)
• MyHttpHandler.java (modified) (1 diff)
• OsmApi.java (added)
• OsmConnection.java (modified) (1 diff)
• OsmReader.java (modified) (5 diffs)
• OsmServerLocationReader.java (modified) (1 diff)
• OsmServerObjectReader.java (modified) (1 diff)
• OsmServerReader.java (modified) (3 diffs)
• OsmServerWriter.java (modified) (8 diffs)
• OsmTransferCancelledException.java (added)
• OsmWriter.java (modified) (7 diffs)
• XmlWriter.java (modified) (3 diffs)

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

@@ -5 +5 @@
 
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.StringReader;
 import java.util.Collection;
 import java.util.HashMap;
@@ -18 +17 @@
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
+import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
 import org.xml.sax.Attributes;
@@ -27 +26 @@
 /**
  */
-public class DiffResultReader implements Visitor {
+public class DiffResultReader extends AbstractVisitor {
 
     /**
@@ -65 +64 @@
      * Parse the given input source and return the dataset.
      */
-    public static void parseDiffResult(InputStream source, Collection<OsmPrimitive> osm, Collection<OsmPrimitive> processed, Map<OsmPrimitive,Long> newIdMap, PleaseWaitDialog pleaseWaitDlg)
+    public static void parseDiffResult(String source, Collection<OsmPrimitive> osm, Collection<OsmPrimitive> processed, Map<OsmPrimitive,Long> newIdMap, PleaseWaitDialog pleaseWaitDlg)
     throws SAXException, IOException {
 
@@ -71 +70 @@
        drr.processed = processed;
        drr.newIdMap = newIdMap;
-       InputSource inputSource = new InputSource(new InputStreamReader(source, "UTF-8"));
+       InputSource inputSource = new InputSource(new StringReader(source));
        try {
            SAXParserFactory.newInstance().newSAXParser().parse(inputSource, drr.new Parser());
@@ -85 +84 @@
 
        for (OsmPrimitive p : osm) {
-           System.out.println("old: "+ p);
+           //System.out.println("old: "+ p);
            p.visit(drr);
-           System.out.println("new: "+ p);
-           System.out.println("");
+           //System.out.println("new: "+ p);
+           //System.out.println("");
        }
     }

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

@@ -22 +22 @@
     InputStream fs = null;
 
-    public MirroredInputStream(String name) throws IOException
-    {
+    public MirroredInputStream(String name) throws IOException {
         this(name, null, -1L);
     }
 
-    public MirroredInputStream(String name, long maxTime) throws IOException
-    {
+    public MirroredInputStream(String name, long maxTime) throws IOException {
         this(name, null, maxTime);
     }
 
-    public MirroredInputStream(String name, String destDir, long maxTime) throws IOException
-    {
+    public MirroredInputStream(String name, String destDir, long maxTime) throws IOException {
         URL url;
         File file = null;
-        try
-        {
+        try {
             url = new URL(name);
-            if(url.getProtocol().equals("file"))
-            {
+            if (url.getProtocol().equals("file")) {
                 file = new File(name.substring("file:/".length()));
-                if(!file.exists())
+                if (!file.exists())
                     file = new File(name.substring("file://".length()));
+            } else {
+                file = checkLocal(url, destDir, maxTime);
             }
-            else
-                file = checkLocal(url, destDir, maxTime);
-        }
-        catch(java.net.MalformedURLException e)
-        {
-            if(name.startsWith("resource://"))
-            {
+        } catch (java.net.MalformedURLException e) {
+            if(name.startsWith("resource://")) {
                 fs = getClass().getResourceAsStream(
                 name.substring("resource:/".length()));
                 return;
             }
-            else
-                file = new File(name);
+            file = new File(name);
         }
-        if(file == null)
+        if (file == null)
             throw new IOException();
         fs = new FileInputStream(file);
     }
 
-    private File checkLocal(URL url, String destDir, long maxTime)
-    {
+    private File checkLocal(URL url, String destDir, long maxTime) {
         String localPath = Main.pref.get("mirror." + url);
         File file = null;
-        if(localPath != null && localPath.length() > 0)
-        {
+        if (localPath != null && localPath.length() > 0) {
             String[] lp = localPath.split(";");
             file = new File(lp[1]);
-            if(maxTime <= 0)
+            if (maxTime <= 0)
                 maxTime = Main.pref.getInteger("mirror.maxtime", 7*24*60*60);
-            if(System.currentTimeMillis() - Long.parseLong(lp[0]) < maxTime*1000)
-            {
-                if(file.exists())
-                {
+            if (System.currentTimeMillis() - Long.parseLong(lp[0]) < maxTime*1000) {
+                if(file.exists()) {
                     return file;
                 }
@@ -86 +73 @@
 
         File destDirFile = new File(destDir);
-        if(!destDirFile.exists() )
+        if (!destDirFile.exists())
             destDirFile.mkdirs();
 
@@ -93 +80 @@
         BufferedOutputStream bos = null;
         BufferedInputStream bis = null;
-        try
-        {
+        try {
             URLConnection conn = url.openConnection();
             conn.setConnectTimeout(5000);
@@ -101 +87 @@
             byte[] buffer = new byte[4096];
             int length;
-            while((length = bis.read(buffer)) > -1)
+            while ((length = bis.read(buffer)) > -1)
                 bos.write(buffer, 0, length);
-        }
-        catch(IOException ioe)
-        {
-            if(file != null)
+        } catch(IOException ioe) {
+            if (file != null)
                 return file;
-            else
-                return null;
-        }
-        finally
-        {
-            if(bis != null)
-            {
-                try
-                {
+            return null;
+        } finally {
+            if (bis != null) {
+                try {
                     bis.close();
-                }
-                catch (IOException e)
-                {
+                } catch (IOException e) {
                     e.printStackTrace();
                 }
             }
-            if(bos != null)
-            {
-                try
-                {
+            if (bos != null) {
+                try {
                     bos.close();
-                }
-                catch (IOException e)
-                {
+                } catch (IOException e) {
                     e.printStackTrace();
                 }

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

@@ -9 +9 @@
 // Basically a copy of sun.net.www.protocol.http.Handler
 public class MyHttpHandler extends sun.net.www.protocol.http.Handler  {
-            protected String proxy;
-            protected int proxyPort;
+    protected String proxy;
+    protected int proxyPort;
 
-            public MyHttpHandler() {
-                super();
-                proxy = null;
-                proxyPort = -1;
-            }
+    public MyHttpHandler() {
+        super();
+        proxy = null;
+        proxyPort = -1;
+    }
 
-            protected java.net.URLConnection openConnection(URL u)
-                    throws IOException {
-                return openConnection(u, (Proxy) null);
-            }
-            public MyHttpHandler(String proxy, int port) {
-                this.proxy = proxy;
-                proxyPort = port;
-            }
+    protected java.net.URLConnection openConnection(URL u)
+    throws IOException {
+        return openConnection(u, (Proxy) null);
+    }
+    public MyHttpHandler(String proxy, int port) {
+        this.proxy = proxy;
+        proxyPort = port;
+    }
 
-            protected java.net.URLConnection openConnection(URL u, Proxy p)
-                    throws IOException {
-                return new MyHttpURLConnection(u, p, this);
-            }
+    protected java.net.URLConnection openConnection(URL u, Proxy p)
+    throws IOException {
+        return new MyHttpURLConnection(u, p, this);
+    }
 }

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

@@ -49 +49 @@
      */
     static {
-        //TODO: refactor this crap (maybe just insert the damn auth http-header by yourself)
+        // TODO: current authentication handling is sub-optimal in that it seems to use the same authenticator for
+        // any kind of request. HTTP requests executed by plugins, e.g. to password-protected WMS servers,
+        // will use the same username/password which is undesirable.
         try {
             HttpURLConnection.setFollowRedirects(true);

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

@@ -8 +8 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.Map;
@@ -130 +128 @@
      private Map<OsmPrimitiveData, Collection<RelationMemberData>> relations = new HashMap<OsmPrimitiveData, Collection<RelationMemberData>>();
 
-     /**
-      * List of protocol versions that will be accepted on reading
-      */
-     private HashSet<String> allowedVersions = new HashSet<String>();
-
      private class Parser extends DefaultHandler {
           /**
@@ -164 +157 @@
                          if (atts == null)
                               throw new SAXException(tr("Unknown version"));
-                         if (!allowedVersions.contains(atts.getValue("version")))
-                              throw new SAXException(tr("Unknown version")+": "+atts.getValue("version"));
+                         String v = atts.getValue("version");
+                         if (v == null) 
+                             throw new SAXException(tr("Version number missing from OSM data"));
+                         if (!(v.equals("0.5") || v.equals("0.6"))) 
+                             throw new SAXException(tr("Unknown version: {0}", v));
                          // save generator attribute for later use when creating DataSource objects
                          generator = atts.getValue("generator");
-
-
-                    } else if (qName.equals("bound")) {
-                         // old style bounds.
-                         // TODO: remove this around 1st October 2008.
-                         // - this is a bit of a hack; since we still write out old style bound objects,
-                         // we don't want to load them both. so when writing, we add a "note" tag the our
-                         // old-style bound, and when reading, ignore those with a "note".
-                         String note = atts.getValue("note");
-                         if (note == null) {
-                             System.out.println("Notice: old style <bound> element detected; support for these will be dropped in a future release.");
-                             String bbox = atts.getValue("box");
-                             String origin = atts.getValue("origin");
-                             if (origin == null) origin = "";
-                             if (bbox != null) {
-                                  String[] b = bbox.split(",");
-                                  Bounds bounds = new Bounds();
-                                  if (b.length == 4)
-                                       bounds = new Bounds(
-                                                 new LatLon(Double.parseDouble(b[0]),Double.parseDouble(b[1])),
-                                                 new LatLon(Double.parseDouble(b[2]),Double.parseDouble(b[3])));
-                                  DataSource src = new DataSource(bounds, origin);
-                                  ds.dataSources.add(src);
-                             }
-                         }
+                         ds.version = v;
+                         
                     } else if (qName.equals("bounds")) {
                          // new style bounds.
@@ -277 +250 @@
                return Double.parseDouble(atts.getValue(value));
           }
-     }
-
-     /**
-      * Constructor initializes list of allowed protocol versions.
-      */
-     public OsmReader() {
-          // first add the main server version
-          allowedVersions.add(Main.pref.get("osm-server.version", "0.5"));
-          // now also add all compatible versions
-          String[] additionalVersions =
-               Main.pref.get("osm-server.additional-versions", "").split("/,/");
-          if (additionalVersions.length == 1 && additionalVersions[0].length() == 0)
-               additionalVersions = new String[] {};
-          allowedVersions.addAll(Arrays.asList(additionalVersions));
      }
 
@@ -491 +450 @@
           osm.references = ref == null ? new DataSet() : ref;
 
-
           currSource = source;
 

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

@@ -32 +32 @@
             Main.pleaseWaitDlg.currentAction.setText(tr("Downloading OSM data..."));
             final DataSet data = OsmReader.parseDataSet(in, null, Main.pleaseWaitDlg);
-//          String origin = Main.pref.get("osm-server.url")+"/"+Main.pref.get("osm-server.version", "0.5");
 //          Bounds bounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
 //          DataSource src = new DataSource(bounds, origin);

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

@@ -52 +52 @@
             final DataSet data = osm.getDs();
 
-//          String origin = Main.pref.get("osm-server.url")+"/"+Main.pref.get("osm-server.version", "0.5");
 //          Bounds bounds = new Bounds(new LatLon(lat1, lon1), new LatLon(lat2, lon2));
 //          DataSource src = new DataSource(bounds, origin);

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

@@ -27 +27 @@
  */
 public abstract class OsmServerReader extends OsmConnection {
+    
+    private OsmApi api = new OsmApi();
+    
     /**
      * Open a connection to the given url and return a reader on the input stream
@@ -35 +38 @@
      */
     protected InputStream getInputStream(String urlStr, PleaseWaitDialog pleaseWaitDlg) throws IOException {
-        String version = Main.pref.get("osm-server.version", "0.5");
-        urlStr = Main.pref.get("osm-server.url")+"/"+version+"/" + urlStr;
+        api.initialize();
+        urlStr = api.getBaseUrl() + urlStr;
         return getInputStreamRaw(urlStr, pleaseWaitDlg);
     }
@@ -43 +46 @@
 
 //        System.out.println("download: "+urlStr);
-        initAuthentication();
         URL url = new URL(urlStr);
         activeConnection = (HttpURLConnection)url.openConnection();

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
-import java.lang.Math;
-import java.net.ConnectException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.UnknownHostException;
-import java.net.SocketTimeoutException;
 import java.util.Collection;
 import java.util.LinkedList;
+
 import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.data.osm.Relation;
-import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Way;
-import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.visitor.CreateOsmChangeVisitor;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
-import org.openstreetmap.josm.data.osm.visitor.Visitor;
-import org.xml.sax.SAXException;
-import org.openstreetmap.josm.io.XmlWriter.OsmWriterInterface;
 
 /**
@@ -41 +19 @@
  * those in deleted, which are ignored - All objects in deleted list are
  * deleted. - All remaining objects with modified flag set are updated.
- *
- * This class implements visitor and will perform the correct upload action on
- * the visited element.
- *
- * @author imi
  */
-public class OsmServerWriter extends OsmConnection implements Visitor {
+public class OsmServerWriter {
 
     /**
@@ -58 +31 @@
     public Collection<OsmPrimitive> processed;
 
-    /**
-     * Whether the operation should be aborted as soon as possible.
-     */
-    // use the inherited variable
-    // private boolean cancel = false;
-
-    /**
-     * Object describing current changeset
-     */
-    private Changeset changeset;
-
-    /**
-     * Send the dataset to the server. Ask the user first and does nothing if he
-     * does not want to send the data.
-     */
+    private OsmApi api = new OsmApi();
+    
     private static final int MSECS_PER_SECOND = 1000;
     private static final int SECONDS_PER_MINUTE = 60;
@@ -96 +56 @@
     }
 
-    public void uploadOsm(Collection<OsmPrimitive> list) throws SAXException {
+    /**
+     * Send the dataset to the server. 
+     * @param the_version version of the data set
+     * @param list list of objects to send
+     */
+    public void uploadOsm(String the_version, Collection<OsmPrimitive> list) {
         processed = new LinkedList<OsmPrimitive>();
-        initAuthentication();
+        api.initialize();
 
         Main.pleaseWaitDlg.progress.setMaximum(list.size());
         Main.pleaseWaitDlg.progress.setValue(0);
 
-        // controls whether or not we open and close a changeset. API 0.6 requires changesets.
-        boolean useChangesets = Main.pref.get("osm-server.version", "0.5").equals("0.6");
+        boolean useChangesets = api.hasChangesetSupport();
+        
+        // controls whether or not we try and upload the whole bunch in one go
+        boolean useDiffUploads = Main.pref.getBoolean("osm-server.atomic-upload",
+            "0.6".equals(api.getVersion()));
 
-        // controls whether or not we try and uplaod the whole bunch in one go
-        boolean useDiffUploads = Main.pref.getBoolean("osm-server.atomic-upload",
-            Main.pref.get("osm-server.version", "0.5").equals("0.6"));
-
+        // solicit commit comment from user
         String comment = null;
         while (useChangesets && comment == null) {
@@ -117 +82 @@
             if (comment == null)
                 return;
-            /* Don't let people just hit enter */
-            if( comment.trim().length() >= 3 )
+            // Don't let people just hit enter
+            if (comment.trim().length() >= 3)
                 break;
             comment = null;
         }
+        
+        // create changeset if required
         try {
-            if (useChangesets && !startChangeset(10, comment))
-                return;
-        }
-        catch (OsmTransferException ex) {
+            if (useChangesets) api.createChangeset(comment);
+        } catch (OsmTransferException ex) {
             dealWithTransferException(ex);
             return;
@@ -133 +98 @@
         try {
             if (useDiffUploads) {
-                uploadDiff(10, list);
+                // all in one go
+                processed.addAll(api.uploadDiff(list));
             } else {
+                // upload changes individually (90% of code is for the status display...)
                 NameVisitor v = new NameVisitor();
                 uploadStartTime = System.currentTimeMillis();
                 for (OsmPrimitive osm : list) {
-                    if (cancel)
-                        return;
                     osm.visit(v);
                     int progress = Main.pleaseWaitDlg.progress.getValue();
                     String time_left_str = timeLeft(progress, list.size());
                     Main.pleaseWaitDlg.currentAction.setText(
-                    tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
-                    Math.round(100.0*progress/list.size()), progress,
-                    list.size(), time_left_str, tr(v.className), v.name, osm.id));
-                    osm.visit(this);
+                            tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
+                                    Math.round(100.0*progress/list.size()), progress,
+                                    list.size(), time_left_str, tr(v.className), v.name, osm.id));
+                    makeApiRequest(osm);
+                    processed.add(osm);
                     Main.pleaseWaitDlg.progress.setValue(progress+1);
                 }
             }
-            if (useChangesets) stopChangeset(10);
-        } catch (RuntimeException e) {
+            if (useChangesets) api.stopChangeset();
+        } catch (OsmTransferException e) {
             try {
-                if (useChangesets) stopChangeset(10);
-            }
-            catch (OsmTransferException ex) {
-                dealWithTransferException(ex);
-            }
-            e.printStackTrace();
-            throw new SAXException(tr("An error occurred: {0}",e.getMessage()));
-        }
-        catch (OsmTransferException e) {
-            try {
-                if (useChangesets) stopChangeset(10);
-            }
-            catch (OsmTransferException ex) {
-                dealWithTransferException(ex);
+                if (useChangesets) api.stopChangeset();
+            } catch (Exception ee) {
+                // ignore nested exception
             }
             dealWithTransferException(e);
@@ -173 +128 @@
     }
 
-    /* FIXME: This code is terrible, please fix it!!!! */
-
-    /* Ok, this needs some explanation: The problem is that the code for
-     * retrying requests is intertwined with the code that generates the
-     * actual request. This means that for the retry code for the
-     * changeset stuff, it's basically a copy/cut/change slightly
-     * process. What actually needs to happen is that the retrying needs
-     * to be split from the creation of the requests and the retry loop
-     * handled in one place (preferably without recursion). While at you
-     * can fix the issue where hitting cancel doesn't do anything while
-     * retrying. - Mv0 Apr 2008
-     *
-     * Cancelling has an effect now, maybe it does not always catch on. Florian Heer, Aug 08
-     */
-    private boolean startChangeset(int retries, String comment) throws OsmTransferException {
-        Main.pleaseWaitDlg.currentAction.setText(tr("Opening changeset..."));
-        changeset = new Changeset();
-        changeset.put( "created_by", "JOSM" );
-        changeset.put( "comment", comment );
-        try {
-            if (cancel)
-                return false; // assume cancel
-            String version = Main.pref.get("osm-server.version", "0.6");
-            URL url = new URL(
-                    Main.pref.get("osm-server.url") +
-                    "/" + version +
-                    "/" + "changeset" +
-                    "/" + "create");
-            System.out.print("upload to: "+url+ "..." );
-            activeConnection = (HttpURLConnection)url.openConnection();
-            activeConnection.setConnectTimeout(15000);
-            activeConnection.setRequestMethod("PUT");
-            addAuth(activeConnection);
-
-            activeConnection.setDoOutput(true);
-            OutputStream out = activeConnection.getOutputStream();
-            OsmWriter.output(out, changeset);
-            out.close();
-
-            activeConnection.connect();
-            System.out.println("connected");
-
-            int retCode = activeConnection.getResponseCode();
-            if (retCode == 200)
-                changeset.id = readId(activeConnection.getInputStream());
-            System.out.println("got return: "+retCode+" with id "+changeset.id);
-            String retMsg = activeConnection.getResponseMessage();
-            activeConnection.disconnect();
-            if (retCode == 404)    {
-                throw new OsmTransferException(tr("Server does not support changesets"));
-            }
-            if (retCode != 200 && retCode != 412) {
-                if (retries >= 0) {
-                    retries--;
-                    if(sleepAndListen()) return false;
-                    System.out.println("retrying ("+retries+" left)");
-                    return startChangeset(retries, comment);
-                }
-
-                // Look for a detailed error message from the server
-                retMsg += "\n" + readString(activeConnection.getInputStream());
-
-                // Report our error
-                ByteArrayOutputStream o = new ByteArrayOutputStream();
-                OsmWriter.output(o, changeset);
-                System.out.println(new String(o.toByteArray(), "UTF-8").toString());
-                throw new OsmTransferException (retCode + " " + retMsg);
-            }
-        } catch (UnknownHostException e) {
-            throw new OsmTransferException(tr("Unknown host")+": "+e.getMessage(), e);
-        } catch(SocketTimeoutException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return false; // assume cancel
-            if (retries-- > 0)
-                startChangeset(retries, comment);
-            else
-                throw new OsmTransferException (e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        }
-        catch (ConnectException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return false; // assume cancel
-            if (retries-- > 0)
-                startChangeset(retries, comment);
-            else
-                throw new OsmTransferException (e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        }
-
-        catch (Exception e) {
-            if (cancel)
-                return false; // assume cancel
-            if (e instanceof OsmTransferException)
-                throw (OsmTransferException)e;
-            if (e instanceof RuntimeException)
-                throw (RuntimeException)e;
-            throw new RuntimeException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        }
-        return true;
-    }
-
-    private void uploadDiff(int retries, Collection<OsmPrimitive> list) throws OsmTransferException {
-
-        CreateOsmChangeVisitor duv = new CreateOsmChangeVisitor(changeset);
-
-        for (OsmPrimitive osm : list) {
-            int progress = Main.pleaseWaitDlg.progress.getValue();
-            Main.pleaseWaitDlg.currentAction.setText(tr("Preparing..."));
-            if (cancel)
-                return;
-            osm.visit(duv);
-            Main.pleaseWaitDlg.progress.setValue(progress+1);
-        }
-        System.out.println("the document:\n");
-        String diff = duv.getDocument();
-        System.out.println(diff);
-
-        Main.pleaseWaitDlg.currentAction.setText(tr("Uploading..."));
-        try {
-            if (cancel)
-                return; // assume cancel
-            String version = Main.pref.get("osm-server.version", "0.6");
-            URL url = new URL(
-                    Main.pref.get("osm-server.url") +
-                    "/" + version +
-                    "/" + "changeset" +
-                    "/" + changeset.id +
-                    "/upload" );
-            System.out.print("upload to: "+url+ "..." );
-            activeConnection = (HttpURLConnection)url.openConnection();
-            activeConnection.setConnectTimeout(15000);
-            activeConnection.setRequestMethod("POST");
-            addAuth(activeConnection);
-
-            activeConnection.setDoOutput(true);
-            PrintWriter out;
-            try {
-                out = new PrintWriter(new OutputStreamWriter(activeConnection.getOutputStream(), "UTF-8"));
-            } catch (UnsupportedEncodingException e) {
-                throw new RuntimeException(e);
-            }
-            out.print(diff);
-            out.close();
-
-            activeConnection.connect();
-            System.out.println("connected");
-
-            int retCode = activeConnection.getResponseCode();
-            String retMsg = "";
-
-            if (retCode == 200) {
-                DiffResultReader.parseDiffResult(activeConnection.getInputStream(), list, processed, duv.getNewIdMap(), Main.pleaseWaitDlg);
-            } else if (retCode != 200 && retCode != 412) {
-                if (retries >= 0) {
-                    retries--;
-                    if(sleepAndListen()) return;
-                    System.out.println("retrying ("+retries+" left)");
-                    stopChangeset(retries);
-                } else {
-                    // Look for a detailed error message from the server
-                    retMsg += "\n" + readString(activeConnection.getInputStream());
-
-                    // Report our error
-                    ByteArrayOutputStream o = new ByteArrayOutputStream();
-                    OsmWriter.output(o, changeset);
-                    System.out.println(new String(o.toByteArray(), "UTF-8").toString());
-                    throw new OsmTransferException(retCode+" "+retMsg);
-                }
-            }
-        } catch (UnknownHostException e) {
-            throw new OsmTransferException(tr("Unknown host")+": "+e.getMessage(), e);
-        } catch(SocketTimeoutException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return; // assume cancel
-            if (retries-- > 0)
-                stopChangeset(retries);
-            else
-                throw new OsmTransferException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        } catch(ConnectException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return; // assume cancel
-            if (retries-- > 0)
-                stopChangeset(retries);
-            else
-                throw new OsmTransferException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        } catch (Exception e) {
-            if (cancel)
-                return; // assume cancel
-            if (e instanceof OsmTransferException)
-                throw (OsmTransferException)e;
-            if (e instanceof RuntimeException)
-                throw (RuntimeException)e;
-            throw new RuntimeException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        }
-    }
-
-
-    private void stopChangeset(int retries) throws OsmTransferException {
-        Main.pleaseWaitDlg.currentAction.setText(tr("Closing changeset..."));
-        try {
-            if (cancel)
-                return; // assume cancel
-            String version = Main.pref.get("osm-server.version", "0.6");
-            URL url = new URL(
-                    Main.pref.get("osm-server.url") +
-                    "/" + version +
-                    "/" + "changeset" +
-                    "/" + changeset.id +
-                    "/close" );
-            System.out.print("upload to: "+url+ "..." );
-            activeConnection = (HttpURLConnection)url.openConnection();
-            activeConnection.setConnectTimeout(15000);
-            activeConnection.setRequestMethod("PUT");
-            addAuth(activeConnection);
-
-            activeConnection.setDoOutput(true);
-            OutputStream out = activeConnection.getOutputStream();
-            OsmWriter.output(out, changeset);
-            out.close();
-
-            activeConnection.connect();
-            System.out.println("connected");
-
-            int retCode = activeConnection.getResponseCode();
-            System.out.println("got return: "+retCode);
-            String retMsg = activeConnection.getResponseMessage();
-            activeConnection.disconnect();
-            if (retCode == 404)    {
-                System.out.println("Server does not support changesets, or the changeset could not be found, continuing");
-                return;
-            }
-            if (retCode != 200 && retCode != 412) {
-                if (retries >= 0) {
-                    retries--;
-                    if(sleepAndListen()) return;
-                    System.out.println("retrying ("+retries+" left)");
-                    stopChangeset(retries);
-                } else {
-                    // Look for a detailed error message from the server
-                    retMsg += readString(activeConnection.getInputStream());
-
-                    // Report our error
-                    ByteArrayOutputStream o = new ByteArrayOutputStream();
-                    OsmWriter.output(o, changeset);
-                    System.out.println(new String(o.toByteArray(), "UTF-8").toString());
-                    throw new OsmTransferException(retCode+" "+retMsg);
-                }
-            }
-        } catch (UnknownHostException e) {
-            throw new OsmTransferException(tr("Unknown host")+": "+e.getMessage(), e);
-        } catch(SocketTimeoutException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return; // assume cancel
-            if (retries-- > 0)
-                stopChangeset(retries);
-            else
-                throw new OsmTransferException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        } catch(ConnectException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return; // assume cancel
-            if (retries-- > 0)
-                stopChangeset(retries);
-            else
-                throw new OsmTransferException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        } catch (Exception e) {
-            if (cancel)
-                return; // assume cancel
-            if (e instanceof OsmTransferException)
-                throw (OsmTransferException)e;
-            if (e instanceof RuntimeException)
-                throw (RuntimeException)e;
-            throw new RuntimeException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        }
-    }
-
-    private boolean sleepAndListen() {
-        // System.out.print("backing off for 10 seconds...");
-        for(int i=0; i < 10; i++) {
-            if(cancel || isAuthCancelled()) {
-                if(!cancel) cancel();
-                return true;
-            }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException ex) {}
-        }
-        return false;
-    }
-
-    /**
-     * Upload a single node.
-     */
-    public void visit(Node n) {
-        if (n.deleted) {
-            sendRequest("DELETE", "node", n, true);
+    void makeApiRequest(OsmPrimitive osm) throws OsmTransferException {
+        if (osm.deleted) {
+            api.deletePrimitive(osm);
+        } else if (osm.id == 0) {
+            api.createPrimitive(osm);
         } else {
-            sendRequest("PUT", "node", n, true);
-        }
-        processed.add(n);
-    }
-
-    /**
-     * Upload a whole way with the complete node id list.
-     */
-    public void visit(Way w) {
-        if (w.deleted) {
-            sendRequest("DELETE", "way", w, true);
-        } else {
-            sendRequest("PUT", "way", w, true);
-        }
-        processed.add(w);
-    }
-
-    /**
-     * Upload an relation with all members.
-     */
-    public void visit(Relation e) {
-        if (e.deleted) {
-            sendRequest("DELETE", "relation", e, true);
-        } else {
-            sendRequest("PUT", "relation", e, true);
-        }
-        processed.add(e);
-    }
-
-    /**
-     * Read a long from the input stream and return it.
-     */
-    private long readId(InputStream inputStream) throws IOException {
-        BufferedReader in = new BufferedReader(new InputStreamReader(
-                inputStream));
-        String s = in.readLine();
-        if (s == null)
-            return 0;
-        try {
-            return Long.parseLong(s);
-        } catch (NumberFormatException e) {
-            return 0;
-        }
-    }
-
-    /**
-     * Consume the input stream and return it as a string.
-     */
-    private String readString(InputStream inputStream) throws IOException {
-        BufferedReader in = new BufferedReader(new InputStreamReader(
-                inputStream));
-        StringBuffer sb = new StringBuffer();
-        String s;
-        while((s = in.readLine()) != null) {
-            sb.append(s);
-            sb.append("\n");
-        }
-        return sb.toString();
-    }
-
-    /**
-     * Send the request. The objects id will be replaced if it was 0 before
-     * (on add requests).
-     *
-     * @param requestMethod The http method used when talking with the server.
-     * @param urlSuffix The suffix to add at the server url.
-     * @param osm The primitive to encode to the server.
-     * @param body the body to be sent
-     */
-    private void sendRequestRetry(String requestMethod, String urlSuffix,
-            OsmPrimitive osm, OsmWriterInterface body, int retries) throws OsmTransferException {
-        try {
-            if (cancel)
-                return; // assume cancel
-            String version = Main.pref.get("osm-server.version", "0.5");
-            URL url = new URL(
-                    new URL(Main.pref.get("osm-server.url") +
-                    "/" + version + "/"),
-                    urlSuffix +
-                    "/" + (osm.id==0 ? "create" : osm.id),
-                    new MyHttpHandler());
-            System.out.print("upload to: "+url+ "..." );
-            activeConnection = (HttpURLConnection)url.openConnection();
-            activeConnection.setConnectTimeout(15000);
-            activeConnection.setRequestMethod(requestMethod);
-            addAuth(activeConnection);
-            if (body != null) {
-                activeConnection.setDoOutput(true);
-                OutputStream out = activeConnection.getOutputStream();
-                OsmWriter.output(out, body);
-                out.close();
-            }
-            activeConnection.connect();
-            System.out.println("connected");
-
-            int retCode = activeConnection.getResponseCode();
-            /* When creating new, the returned value is the new id, otherwise it is the new version */
-            if (retCode == 200)    {
-                if (osm.id == 0) {
-                    osm.id = readId(activeConnection.getInputStream());
-                    osm.version = 1;
-                } else {
-                    int read_version = (int)readId(activeConnection.getInputStream());
-                    if (read_version > 0)
-                        osm.version = read_version;
-                }
-            } else {
-                System.out.println("got return: "+retCode+" with id "+osm.id);
-            }
-            activeConnection.disconnect();
-            if (retCode == 410 && requestMethod.equals("DELETE"))
-                return; // everything fine.. was already deleted.
-            else if (retCode != 200) {
-                if (retries >= 0 && retCode != 412)    {
-                    retries--;
-                    if(sleepAndListen()) return;
-                    System.out.println("retrying ("+retries+" left)");
-                    sendRequestRetry(requestMethod, urlSuffix, osm, body, retries);
-                } else {
-                    String retMsg = activeConnection.getResponseMessage();
-                    // Look for a detailed error message from the server
-                    if (activeConnection.getHeaderField("Error") != null)
-                        retMsg += "\n" + activeConnection.getHeaderField("Error");
-
-                    // Report our error
-                    ByteArrayOutputStream o = new ByteArrayOutputStream();
-                    OsmWriter.output(o, body);
-                    System.out.println(new String(o.toByteArray(), "UTF-8").toString());
-                    throw new OsmTransferException(retCode+" "+retMsg);
-                }
-            }
-        } catch (UnknownHostException e) {
-            throw new OsmTransferException(tr("Unknown host")+": "+e.getMessage(), e);
-        } catch(SocketTimeoutException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return; // assume cancel
-            if (retries-- > 0)
-                sendRequestRetry(requestMethod, urlSuffix, osm, body, retries);
-            else
-                throw new OsmTransferException (e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        } catch(ConnectException e) {
-            System.out.println(" timed out, retries left: " + retries);
-            if (cancel)
-                return; // assume cancel
-            if (retries-- > 0)
-                sendRequestRetry(requestMethod, urlSuffix, osm, body, retries);
-            else
-                throw new OsmTransferException (e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        } catch (Exception e) {
-            if (cancel)
-                return; // assume cancel
-            if (e instanceof OsmTransferException)
-                throw (OsmTransferException)e;
-            if (e instanceof RuntimeException)
-                throw (RuntimeException)e;
-            throw new RuntimeException(e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
-        }
-    }
-
-    private void sendRequest(String requestMethod, String urlSuffix,
-            OsmPrimitive osm, boolean addBody)  {
-        XmlWriter.OsmWriterInterface body = null;
-        if (addBody) {
-                body = new OsmWriter.Single(osm, true, changeset);
-        }
-        try {
-            sendRequestRetry(requestMethod, urlSuffix, osm, body, 10);
-        }
-        catch (OsmTransferException e) {
-            dealWithTransferException (e);
+            api.modifyPrimitive(osm);
         }
     }
@@ -649 +140 @@
     private void dealWithTransferException (OsmTransferException e) {
         Main.pleaseWaitDlg.currentAction.setText(tr("Transfer aborted due to error (will wait for 5 seconds):") + e.getMessage());
-        cancel = true;
         try {
             Thread.sleep(5000);

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

@@ -6 +6 @@
 import java.util.Map.Entry;
 
-import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.DataSource;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
 import org.openstreetmap.josm.data.osm.RelationMember;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -26 +25 @@
 
     /**
-     * The counter for new created objects. Starting at -1 and goes down.
+     * The counter for newly created objects. Starts at -1 and goes down.
      */
     private long newIdCounter = -1;
+ 
     /**
      * All newly created ids and their primitive that uses it. This is a back reference
@@ -35 +35 @@
     public HashMap<OsmPrimitive, Long> usedNewIds = new HashMap<OsmPrimitive, Long>();
 
-    private final boolean osmConform;
-    private final Changeset changeset;
-
-    public abstract static class Osm implements OsmWriterInterface {
-        public void header(PrintWriter out) {
-            out.print("<osm version='");
-            out.print(Main.pref.get("osm-server.version", "0.5"));
-            out.println("' generator='JOSM'>");
-        }
-        public void footer(PrintWriter out) {
-            out.println("</osm>");
-        }
-    }
-
-    // simple helper to write the object's class to the out stream
-    private Visitor typeWriteVisitor = new Visitor() {
-        public void visit(Node n) { out.print("node"); }
-        public void visit(Way w) { out.print("way"); }
-        public void visit(Relation e) { out.print("relation"); }
-    };
-
-    /**
-     * An output writer for function output that writes everything of the given dataset into
-     * the xml
-     */
-    public static final class All extends Osm {
-        private final DataSet ds;
-        private final boolean osmConform;
-
-        /**
-         * Construct an writer function
-         * @param osmConform <code>true</code>, if the xml should be 100% osm conform. In this
-         *      case, not all information can be retrieved later (as example, modified state
-         *      is lost and id's remain 0 instead of decrementing from -1)
-         */
-        public All(DataSet ds, boolean osmConform) {
-            this.ds = ds;
-            this.osmConform = osmConform;
-        }
-
-        public void write(PrintWriter out) {
-            Visitor writer = new OsmWriter(out, osmConform, null);
-            for (Node n : ds.nodes)
-                if (shouldWrite(n))
-                    writer.visit(n);
-            for (Way w : ds.ways)
-                if (shouldWrite(w))
-                    writer.visit(w);
-            for (Relation e : ds.relations)
-                if (shouldWrite(e))
-                    writer.visit(e);
-        }
-
-        private boolean shouldWrite(OsmPrimitive osm) {
-            return osm.id != 0 || !osm.deleted;
-        }
-
-        @Override public void header(PrintWriter out) {
-            super.header(out);
-            for (DataSource s : ds.dataSources) {
-                out.println("  <bounds minlat='"
-                + s.bounds.min.lat()+"' minlon='"
-                + s.bounds.min.lon()+"' maxlat='"
-                + s.bounds.max.lat()+"' maxlon='"
-                + s.bounds.max.lon()
-                +"' origin='"+XmlWriter.encode(s.origin)+"' />");
-            }
-        }
-    }
-
-    /**
-     * An output writer for functino output that writes only one specific primitive into
-     * the xml
-     */
-    public static final class Single extends Osm {
-        private final OsmPrimitive osm;
-        private final boolean osmConform;
-        private final Changeset changeset;
-
-        public Single(OsmPrimitive osm, boolean osmConform, Changeset changeset) {
-            this.osm = osm;
-            this.osmConform = osmConform;
-            this.changeset = changeset;
-        }
-
-        public void write(PrintWriter out) {
-            osm.visit(new OsmWriter(out, osmConform, changeset));
-        }
-    }
-
-    public OsmWriter(PrintWriter out, boolean osmConform, Changeset changeset) {
+    private boolean osmConform;
+    private boolean withBody = true;
+    private String version;
+    private Changeset changeset;
+    
+    public OsmWriter(PrintWriter out, boolean osmConform, String version) {
         super(out);
         this.osmConform = osmConform;
-        this.changeset = changeset;
+        this.version = version;
+    }
+    
+    public void setWithBody(boolean wb) {
+        this.withBody = wb;
+    }
+    public void setChangeset(Changeset cs) {
+        this.changeset = cs;
+    }
+    public void setVersion(String v) {
+        this.version = v;
+    }
+    
+    public void header() {
+        out.println("<?xml version='1.0' encoding='UTF-8'?>");
+        out.print("<osm version='");
+        out.print(version);
+        out.println("' generator='JOSM'>");
+    }
+    public void footer() {
+        out.println("</osm>");
+    }
+
+    public void writeContent(DataSet ds) {
+        for (Node n : ds.nodes)
+            if (shouldWrite(n))
+                visit(n);
+        for (Way w : ds.ways)
+            if (shouldWrite(w))
+                visit(w);
+        for (Relation e : ds.relations)
+            if (shouldWrite(e))
+                visit(e);
+    }
+
+    private boolean shouldWrite(OsmPrimitive osm) {
+        return osm.id != 0 || !osm.deleted;
+    }
+
+    public void writeDataSources(DataSet ds) {
+        for (DataSource s : ds.dataSources) {
+            out.println("  <bounds minlat='"
+                    + s.bounds.min.lat()+"' minlon='"
+                    + s.bounds.min.lon()+"' maxlat='"
+                    + s.bounds.max.lat()+"' maxlon='"
+                    + s.bounds.max.lon()
+                    +"' origin='"+XmlWriter.encode(s.origin)+"' />");
+        }
     }
 
@@ -135 +97 @@
         addCommon(n, "node");
         out.print(" lat='"+n.coor.lat()+"' lon='"+n.coor.lon()+"'");
-        addTags(n, "node", true);
+        if (!withBody) {
+            out.println("/>");  
+        } else {
+            addTags(n, "node", true);
+        }
     }
 
@@ -141 +107 @@
         if (w.incomplete) return;
         addCommon(w, "way");
-        out.println(">");
-        for (Node n : w.nodes)
-            out.println("    <nd ref='"+getUsedId(n)+"' />");
-        addTags(w, "way", false);
+        if (!withBody) {
+            out.println("/>");  
+        } else {
+            out.println(">");
+            for (Node n : w.nodes)
+                out.println("    <nd ref='"+getUsedId(n)+"' />");
+            addTags(w, "way", false);
+        }
     }
 
@@ -150 +120 @@
         if (e.incomplete) return;
         addCommon(e, "relation");
-        out.println(">");
-        for (RelationMember em : e.members) {
-            out.print("    <member type='");
-            em.member.visit(typeWriteVisitor);
-            out.println("' ref='"+getUsedId(em.member)+"' role='" +
-                XmlWriter.encode(em.role) + "' />");
-        }
-        addTags(e, "relation", false);
-    }
-
+        if (!withBody) {
+            out.println("/>");  
+        } else {
+            out.println(">");
+            for (RelationMember em : e.members) {
+                out.print("    <member type='");
+                out.print(OsmApi.which(em.member));
+                out.println("' ref='"+getUsedId(em.member)+"' role='" +
+                        XmlWriter.encode(em.role) + "' />");
+            }
+            addTags(e, "relation", false);
+        }
+    }
+
+    public void visit(Changeset cs) {
+        addCommon(cs, "changeset");
+        out.println(">\n");
+        addTags(cs, "changeset", false);
+    }
+
+    public final void footer(PrintWriter out) {
+        out.println("</osm>");
+    }
 
     /**
@@ -192 +175 @@
      */
     private void addCommon(OsmPrimitive osm, String tagname) {
-        out.print("  <"+tagname+" id='"+getUsedId(osm)+"'");
+        long id = getUsedId(osm);
+        out.print("  <"+tagname);
+        if (id != 0) {
+             out.print(" id='"+getUsedId(osm)+"'");
+        }
         if (!osmConform) {
             String action = null;

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

@@ -2 +2 @@
 package org.openstreetmap.josm.io;
 
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
-import java.io.UnsupportedEncodingException;
 import java.util.HashMap;
 
@@ -15 +12 @@
 public class XmlWriter {
 
-    /**
-     * The interface to write the data into an Osm stream
-     * @author immanuel.scholz
-     */
-    public static interface OsmWriterInterface {
-        void header(PrintWriter out);
-        void write(PrintWriter out);
-        void footer(PrintWriter out);
-    }
-
-
-    protected XmlWriter(PrintWriter out) {
+    protected PrintWriter out;
+    
+    public XmlWriter(PrintWriter out) {
         this.out = out;
     }
-
+    
     /**
      * Encode the given string in XML1.0 format.
@@ -49 +37 @@
 
     /**
-     * Write the header and start tag, then call the runnable to add all real tags and finally
-     * "closes" the xml by writing the footer.
-     */
-    public static void output(OutputStream outStream, OsmWriterInterface outputWriter) {
-        PrintWriter out;
-        try {
-            out = new PrintWriter(new OutputStreamWriter(outStream, "UTF-8"));
-        } catch (UnsupportedEncodingException e) {
-            throw new RuntimeException(e);
-        }
-        out.println("<?xml version='1.0' encoding='UTF-8'?>");
-        outputWriter.header(out);
-        outputWriter.write(out);
-        outputWriter.footer(out);
-        out.flush();
-        out.close();
-    }
-
-    /**
      * The output writer to save the values to.
      */
-    protected final PrintWriter out;
     final private static HashMap<Character, String> encoding = new HashMap<Character, String>();
     static {