Changeset 12778 in osm for applications/editors/josm/plugins/DirectUpload

Timestamp:

2009-01-01T18:28:53+01:00 (16 years ago)

Author:

stoecker

Message:

removed tab stop usage

Location:

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload

Files:

• UploadDataGui.java (modified) (16 diffs)
• UploadDataGuiPlugin.java (modified) (1 diff)

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

@@ -40 +40 @@
  */
 public class UploadDataGui extends javax.swing.JFrame {
- 
- String tagging;   
- String Descriptionfield;  
+
+ String tagging;
+ String Descriptionfield;
  String urlDescription;
  String urlTags;
@@ -48 +48 @@
  String PassWord;
  //GpxData gpxData;
-         
+
         public static final String API_VERSION = "0.5";
         private static final String BASE64_ENC = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
         private static final String BOUNDARY = "----------------------------d10f7aa230e8";
         private static final String LINE_END = "\r\n";
-     
+
         boolean dfield;
         boolean taggy;
@@ -60 +60 @@
         boolean pass;
         boolean publicheck;
-     
+
         DateFormat dateFormat = new SimpleDateFormat("yyMMddHHmmss");
-        Date date = new Date();    
+        Date date = new Date();
         String datename = dateFormat.format(date);
-  
+
     /** Creates new form UploadDataGui */
     public UploadDataGui() {
@@ -70 +70 @@
     }
 
-  
+
     /** This method is called from within the constructor to
      * initialize the form.
@@ -142 +142 @@
 
 
-        
-        Container contentPane = getContentPane();
-        contentPane.setLayout(new GridBagLayout());
-        GridBagConstraints c = new GridBagConstraints();
-
-        c.gridx = 0;
-        c.gridy = 0;
-        c.gridwidth = 2;
-        c.fill = 1;
-        contentPane.add(OutputDisplay, c);
-
-        c.gridwidth = 1;
-        c.gridy = 1;
-        contentPane.add(jLabel3, c);
-        c.gridx = 1;
-        contentPane.add(tagfield, c);
-
-        c.gridy = 2; c.gridx = 0;
-        contentPane.add(jLabel1, c);
-        c.gridx = 1;
-        contentPane.add(descriptionfield, c);
-
-        c.gridy = 3; c.gridx = 0;
-        contentPane.add(jLabel2, c);
-        c.gridx = 1;
-        contentPane.add(PublicTrace, c);
-
-        c.gridy = 4; c.gridx = 0;
-        contentPane.add(CancelButton, c);
-        c.gridx = 1;
-        contentPane.add(OkButton, c);
+
+    Container contentPane = getContentPane();
+    contentPane.setLayout(new GridBagLayout());
+    GridBagConstraints c = new GridBagConstraints();
+
+    c.gridx = 0;
+    c.gridy = 0;
+    c.gridwidth = 2;
+    c.fill = 1;
+    contentPane.add(OutputDisplay, c);
+
+    c.gridwidth = 1;
+    c.gridy = 1;
+    contentPane.add(jLabel3, c);
+    c.gridx = 1;
+    contentPane.add(tagfield, c);
+
+    c.gridy = 2; c.gridx = 0;
+    contentPane.add(jLabel1, c);
+    c.gridx = 1;
+    contentPane.add(descriptionfield, c);
+
+    c.gridy = 3; c.gridx = 0;
+    contentPane.add(jLabel2, c);
+    c.gridx = 1;
+    contentPane.add(PublicTrace, c);
+
+    c.gridy = 4; c.gridx = 0;
+    contentPane.add(CancelButton, c);
+    c.gridx = 1;
+    contentPane.add(OkButton, c);
 
         pack();
@@ -181 +181 @@
 public void upload(String username, String password, String Descriptionfield, String tagging , GpxData gpxData ) throws IOException {
         OutputDisplay.setText("Starting to upload selected file to openstreetmap.org");
-    
+
     try {
-        
+
         urlDescription = Descriptionfield.replaceAll("\\.;&?,/","_");
         if (urlDescription == null || urlDescription.length() == 0) {
              OutputDisplay.setText("No description provided .Please provide some description . For the time being ignore the exception error ");
-           
+
         }
            urlTags = tagging.replaceAll("\\\\.;&?,/","_");
-      
-       
+
+
         URL url = new URL("http://www.openstreetmap.org/api/" + API_VERSION + "/gpx/create");
             System.err.println("url: " + url);
@@ -212 +212 @@
         writeContentDisposition(out, "public", "1");
            } else {
-        writeContentDisposition(out, "public", "0");   
+        writeContentDisposition(out, "public", "0");
            }
         out.writeBytes("--" + BOUNDARY + "--" + LINE_END);
         out.flush();
-      
+
         int returnCode = connect.getResponseCode();
             String returnMsg = connect.getResponseMessage();
             System.err.println(returnCode);
             OutputDisplay.setText(returnMsg);
-        if (returnCode != 200) {  
+        if (returnCode != 200) {
             if (connect.getHeaderField("Error") != null)
                returnMsg += "\n" + connect.getHeaderField("Error");
@@ -228 +228 @@
         out.close();
         connect.disconnect();
-       
-        } catch(UnsupportedEncodingException ignore) { 
+
+        } catch(UnsupportedEncodingException ignore) {
         } catch (MalformedURLException e) {
                 OutputDisplay.setText("Cant Upload .");
                 e.printStackTrace();
     }
-  
+
 }
 
@@ -246 +246 @@
 
 private void OkButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_OkButtonActionPerformed
-     GpxData gpxData; 
-       
-        UserName  =  Main.pref.get("osm-server.username");   
+     GpxData gpxData;
+
+        UserName  =  Main.pref.get("osm-server.username");
         PassWord =   Main.pref.get("osm-server.password");
-        
+
         if(Main.map == null || Main.map.mapView == null ||Main.map.mapView.getActiveLayer() == null ||
                 !(Main.map.mapView.getActiveLayer() instanceof GpxLayer)){
@@ -260 +260 @@
         gpxData = ((GpxLayer)Main.map.mapView.getActiveLayer()).data;
                 System.out.println(Descriptionfield);
-        try { 
+        try {
                 upload(UserName,PassWord,Descriptionfield ,tagging ,gpxData) ;
         } catch (IOException ex) {
                 Logger.getLogger(UploadDataGui.class.getName()).log(Level.SEVERE, null, ex);
-    }     
-    
+    }
+
 }//GEN-LAST:event_OkButtonActionPerformed
 
@@ -276 +276 @@
     if (evt.getStateChange() == ItemEvent.SELECTED) {
         publicheck = true;
-         
+
     }
 }//GEN-LAST:event_PublicTraceItemStateChanged
@@ -284 +284 @@
      JTextField Descsel = (JTextField)evt.getSource();
         Descriptionfield =  Descsel.getText();
-    
+
 }//GEN-LAST:event_descriptionfieldFocusLost
 
@@ -291 +291 @@
      JTextField Tagsel = (JTextField)evt.getSource();
         tagging =  Tagsel.getText();
-    
+
 }//GEN-LAST:event_tagfieldFocusLost
 
@@ -300 +300 @@
         out.writeBytes(LINE_END);
         out.writeBytes(value + LINE_END);
-        
+
     }
 
     private void writeContentDispositionGpxData(DataOutputStream out, String name, GpxData gpxData ) throws IOException {
-    
+
         out.writeBytes("--" + BOUNDARY + LINE_END);
         out.writeBytes("Content-Disposition: form-data; name=\"" + name + "\"; filename=\"" + datename +".gpx" + "\"" + LINE_END);
@@ -310 +310 @@
         out.writeBytes("Content-Type: application/octet-stream" + LINE_END);
         out.writeBytes(LINE_END);
-          
+
         OutputDisplay.setText("Transferring data to server");
             new GpxWriter(out).write(gpxData);
         out.flush();
-        out.writeBytes(LINE_END); 
-     
-    }
-    
- // Taken from Christof Dallermassal java class :  
+        out.writeBytes(LINE_END);
+
+    }
+
+ // Taken from Christof Dallermassal java class :
 public String encodeBase64(String s) {
         StringBuilder out = new StringBuilder();
@@ -328 +328 @@
             out.append(l>1 ? BASE64_ENC.charAt((buf.charAt(1) & 0x0f) << 2 | (l==2 ? 0 : (buf.charAt(2) & 0xc0) >> 6)) : '=');
             out.append(l>2 ? BASE64_ENC.charAt(buf.charAt(2) & 0x3f) : '=');
-           
+
         }
         return out.toString();
-        }    
+        }
 
     // Variables declaration - do not modify//GEN-BEGIN:variables

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGuiPlugin.java

@@ -2 +2 @@
  *  Copyright by Subhodip Biswas
  *  This program is free software and licensed under GPL.
- * 
+ *
  */