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

Timestamp:

2010-09-15T18:54:18+02:00 (14 years ago)

Author:

stoecker

Message:

remove tabs

Location:

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

Files:

• UploadDataGui.java (modified) (3 diffs)
• UploadDataGuiPlugin.java (modified) (3 diffs)

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

@@ -82 +82 @@
 
         @Override
-                public String toString() {
+        public String toString() {
             return this.name().toLowerCase();
         }
@@ -134 +134 @@
      */
     private JPanel initComponents() {
-        JLabel visibilityLabel = new JLabel(tr("Visibility"));
+        JLabel visibilityLabel = new JLabel(tr("Visibility"));
         visibilityLabel.setToolTipText(tr("Defines the visibility of your trace for other OSM users."));
         for(visibility v : visibility.values()) {
-                visibilityCombo.addItem(v.description);
+            visibilityCombo.addItem(v.description);
         }
         UrlLabel visiUrl = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces"), tr("(What does that mean?)"));
@@ -205 +205 @@
      */
     private void upload(String description, String tags, String visi, GpxData gpxData, ProgressMonitor progressMonitor) throws IOException {
-        progressMonitor.beginTask(null);
-        try {
-                if(checkForErrors(username, password, description, gpxData))
-                        return;
-
-                // Clean description/tags from disallowed chars
-                description = description.replaceAll("[&?/\\\\]"," ");
-                tags = tags.replaceAll("[&?/\\\\.;]"," ");
-
-                // Set progress dialog to indeterminate while connecting
-                progressMonitor.indeterminateSubTask(tr("Connecting..."));
-
-                try {
-                        // Generate data for upload
-                        ByteArrayOutputStream baos  = new ByteArrayOutputStream();
-                        writeGpxFile(baos, "file", gpxData);
-                        writeField(baos, "description", description);
-                        writeField(baos, "tags", (tags != null && tags.length() > 0) ? tags : "");
-                        writeField(baos, "visibility", visi);
-                        writeString(baos, "--" + BOUNDARY + "--" + LINE_END);
-
-                        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-                        HttpURLConnection conn = setupConnection(baos.size());
-
-                        progressMonitor.setTicksCount(baos.size());
-                        progressMonitor.subTask(null);
-
-                        try {
-                                flushToServer(bais, conn.getOutputStream(), progressMonitor);
-                        } catch(Exception e) {}
-
-                        if(cancelled) {
-                                conn.disconnect();
-                                OutputDisplay.setText(tr("Upload cancelled"));
-                                buttons.get(0).setEnabled(true);
-                                cancelled = false;
-                        } else {
-                                boolean success = finishUpConnection(conn);
-                                buttons.get(0).setEnabled(!success);
-                                if(success)
-                                        buttons.get(1).setText(tr("Close"));
-                        }
-                } catch(Exception e) {
-                        OutputDisplay.setText(tr("Error while uploading"));
-                        e.printStackTrace();
-                }
-        } finally {
-                progressMonitor.finishTask();
-        }
+        progressMonitor.beginTask(null);
+        try {
+            if(checkForErrors(username, password, description, gpxData))
+                return;
+
+            // Clean description/tags from disallowed chars
+            description = description.replaceAll("[&?/\\\\]"," ");
+            tags = tags.replaceAll("[&?/\\\\.;]"," ");
+
+            // Set progress dialog to indeterminate while connecting
+            progressMonitor.indeterminateSubTask(tr("Connecting..."));
+
+            try {
+                // Generate data for upload
+                ByteArrayOutputStream baos  = new ByteArrayOutputStream();
+                writeGpxFile(baos, "file", gpxData);
+                writeField(baos, "description", description);
+                writeField(baos, "tags", (tags != null && tags.length() > 0) ? tags : "");
+                writeField(baos, "visibility", visi);
+                writeString(baos, "--" + BOUNDARY + "--" + LINE_END);
+
+                ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+                HttpURLConnection conn = setupConnection(baos.size());
+
+                progressMonitor.setTicksCount(baos.size());
+                progressMonitor.subTask(null);
+
+                try {
+                    flushToServer(bais, conn.getOutputStream(), progressMonitor);
+                } catch(Exception e) {}
+
+                if(cancelled) {
+                    conn.disconnect();
+                    OutputDisplay.setText(tr("Upload cancelled"));
+                    buttons.get(0).setEnabled(true);
+                    cancelled = false;
+                } else {
+                    boolean success = finishUpConnection(conn);
+                    buttons.get(0).setEnabled(!success);
+                    if(success)
+                        buttons.get(1).setText(tr("Close"));
+                }
+            } catch(Exception e) {
+                OutputDisplay.setText(tr("Error while uploading"));
+                e.printStackTrace();
+            }
+        } finally {
+            progressMonitor.finishTask();
+        }
     }
 

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

@@ -27 +27 @@
 
     public UploadDataGuiPlugin(PluginInformation info) {
-        super(info);
+        super(info);
         openaction = new UploadAction();
         Main.main.menu.toolsMenu.add(openaction);
@@ -44 +44 @@
 
         @Override
-                protected void updateEnabledState() {
-                // enable button if there is "one active GpxLayer" or "exactly one GpxLayer in the list of all layers available"
-                if(Main.map == null
+        protected void updateEnabledState() {
+            // enable button if there is "one active GpxLayer" or "exactly one GpxLayer in the list of all layers available"
+            if(Main.map == null
                     || Main.map.mapView == null
                     || Main.map.mapView.getActiveLayer() == null
-                    || !(Main.map.mapView.getActiveLayer() instanceof GpxLayer)) {                
+                    || !(Main.map.mapView.getActiveLayer() instanceof GpxLayer)) {
                 setEnabled(false);
             } else {
-                setEnabled(true);
+                setEnabled(true);
             }
 
@@ -61 +61 @@
             }
 
-        }               
+        }
     }
 }