Changeset 1169 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

Timestamp:

2008-12-23T15:07:05+01:00 (17 years ago)

Author:

stoecker

Message:

removed usage of tab stops

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (26 diffs)

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

@@ -79 +79 @@
 
     long uploadStartTime;
-    
+
     public String timeLeft(int progress, int list_size) {
         long now = System.currentTimeMillis();
@@ -96 +96 @@
         return time_left_str;
     }
-    
+
     public void uploadOsm(Collection<OsmPrimitive> list) throws SAXException {
         processed = new LinkedList<OsmPrimitive>();
@@ -103 +103 @@
         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");
-        
+
         // controls whether or not we try and uplaod the whole bunch in one go
-        boolean useDiffUploads = Main.pref.getBoolean("osm-server.atomic-upload", 
+        boolean useDiffUploads = Main.pref.getBoolean("osm-server.atomic-upload",
             Main.pref.get("osm-server.version", "0.5").equals("0.6"));
-        
+
         String comment = null;
         while (useChangesets && comment == null) {
-            comment = JOptionPane.showInputDialog(Main.parent, 
+            comment = JOptionPane.showInputDialog(Main.parent,
                  tr("Provide a brief comment as to the changes to you are uploading:"),
                  tr("Commit comment"), JOptionPane.QUESTION_MESSAGE);
@@ -131 +131 @@
             return;
         }
-    
+
         try {
             if (useDiffUploads) {
@@ -166 +166 @@
             }
             catch (OsmTransferException ex) {
-                dealWithTransferException(ex);    
+                dealWithTransferException(ex);
             }
             dealWithTransferException(e);
         }
     }
-    
+
     /* FIXME: This code is terrible, please fix it!!!! */
 
@@ -183 +183 @@
      * 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
      */
@@ -198 +198 @@
                     Main.pref.get("osm-server.url") +
                     "/" + version +
-                    "/" + "changeset" + 
+                    "/" + "changeset" +
                     "/" + "create");
             System.out.print("upload to: "+url+ "..." );
@@ -205 +205 @@
             activeConnection.setRequestMethod("PUT");
             addAuth(activeConnection);
-            
+
             activeConnection.setDoOutput(true);
             OutputStream out = activeConnection.getOutputStream();
             OsmWriter.output(out, changeset);
             out.close();
-            
+
             activeConnection.connect();
             System.out.println("connected");
@@ -224 +224 @@
             }
             if (retCode != 200 && retCode != 412) {
-                
+
                 if (retries >= 0) {
                     retries--;
@@ -232 +232 @@
                     return startChangeset(retries, comment);
                 }
-                
+
                 // Look for a detailed error message from the server
                 retMsg += "\n" + readString(activeConnection.getInputStream());
@@ -262 +262 @@
                 throw new OsmTransferException (e.getMessage()+ " " + e.getClass().getCanonicalName(), e);
         }
-        
+
         catch (Exception e) {
             if (cancel)
@@ -274 +274 @@
         return true;
     }
-    
+
     private void uploadDiff(int retries, Collection<OsmPrimitive> list) throws OsmTransferException {
-        
+
         CreateOsmChangeVisitor duv = new CreateOsmChangeVisitor(changeset);
 
@@ -290 +290 @@
         String diff = duv.getDocument();
         System.out.println(diff);
-        
+
         Main.pleaseWaitDlg.currentAction.setText(tr("Uploading..."));
         try {
@@ -299 +299 @@
                     Main.pref.get("osm-server.url") +
                     "/" + version +
-                    "/" + "changeset" + 
+                    "/" + "changeset" +
                     "/" + changeset.id +
                     "/upload" );
@@ -307 +307 @@
             activeConnection.setRequestMethod("POST");
             addAuth(activeConnection);
-            
+
             activeConnection.setDoOutput(true);
             PrintWriter out;
@@ -317 +317 @@
             out.print(diff);
             out.close();
-            
+
             activeConnection.connect();
             System.out.println("connected");
@@ -323 +323 @@
             int retCode = activeConnection.getResponseCode();
             String retMsg = "";
-            
+
             if (retCode == 200) {
                 DiffResultReader.parseDiffResult(activeConnection.getInputStream(), list, processed, duv.getNewIdMap(), Main.pleaseWaitDlg);
@@ -333 +333 @@
                     System.out.println("retrying ("+retries+" left)");
                     stopChangeset(retries);
-                } else { 
+                } else {
                     // Look for a detailed error message from the server
                     retMsg += "\n" + readString(activeConnection.getInputStream());
@@ -372 +372 @@
         }
     }
-    
-    
+
+
     private void stopChangeset(int retries) throws OsmTransferException {
         Main.pleaseWaitDlg.currentAction.setText(tr("Closing changeset..."));
@@ -383 +383 @@
                     Main.pref.get("osm-server.url") +
                     "/" + version +
-                    "/" + "changeset" + 
+                    "/" + "changeset" +
                     "/" + changeset.id +
                     "/close" );
@@ -391 +391 @@
             activeConnection.setRequestMethod("PUT");
             addAuth(activeConnection);
-            
+
             activeConnection.setDoOutput(true);
             OutputStream out = activeConnection.getOutputStream();
             OsmWriter.output(out, changeset);
             out.close();
-            
+
             activeConnection.connect();
             System.out.println("connected");
@@ -415 +415 @@
                     System.out.println("retrying ("+retries+" left)");
                     stopChangeset(retries);
-                } else { 
+                } else {
                     // Look for a detailed error message from the server
                     retMsg += readString(activeConnection.getInputStream());
-                    
+
                     // Report our error
                     ByteArrayOutputStream o = new ByteArrayOutputStream();
@@ -490 +490 @@
         processed.add(e);
     }
-    
+
     /**
      * Read a long from the input stream and return it.
@@ -540 +540 @@
                     new URL(Main.pref.get("osm-server.url") +
                     "/" + version + "/"),
-                    urlSuffix + 
+                    urlSuffix +
                     "/" + (osm.id==0 ? "create" : osm.id),
                     new MyHttpHandler());
@@ -622 +622 @@
         }
     }
-    
+
     private void sendRequest(String requestMethod, String urlSuffix,
             OsmPrimitive osm, boolean addBody)  {
@@ -636 +636 @@
         }
     }
-    
+
     private void dealWithTransferException (OsmTransferException e) {
         Main.pleaseWaitDlg.currentAction.setText(tr("Transfer aborted due to error (will wait for 5 seconds):") + e.getMessage());