Changeset 6070 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2013-07-17T00:01:49+02:00 (11 years ago)

Author:

stoecker

Message:

see #8853 remove tabs, trailing spaces, windows line ends, strange characters

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• ActionFlagsTableCell.java (modified) (1 diff)
• ChangesetCommentModel.java (modified) (2 diffs)
• DownloadFileTask.java (modified) (9 diffs)
• DownloadPrimitivesTask.java (modified) (4 diffs)
• RecentlyOpenedFilesMenu.java (modified) (1 diff)
• UploadDialog.java (modified) (4 diffs)
• UploadSelectionDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/ActionFlagsTableCell.java

@@ -28 +28 @@
  * handles everything on its own, in other words it renders itself and also functions
  * as editor so the checkboxes may be set by the user.
- * 
+ *
  * Intended usage is like this:
  * ActionFlagsTableCell aftc = new ActionFlagsTableCell();

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCommentModel.java

@@ -15 +15 @@
      * Sets the current changeset comment and notifies observers if the comment
      * has changed.
-     * 
+     *
      * @param comment the new upload comment. Empty string assumed if null.
      */
@@ -29 +29 @@
     /**
      * Replies the current changeset comment in this model.
-     * 
+     *
      * @return the current changeset comment in this model.
      */

trunk/src/org/openstreetmap/josm/gui/io/DownloadFileTask.java

@@ -49 +49 @@
         this.mkdir = mkdir;
         this.unpack = unpack;
-    }    
-    
+    }
+
     private static class DownloadException extends Exception {
         public DownloadException(String msg) {
@@ -68 +68 @@
 
 
-    @Override 
+    @Override
     protected void cancel() {
         this.canceled = true;
@@ -74 +74 @@
     }
 
-    @Override 
+    @Override
     protected void finish() {}
 
@@ -91 +91 @@
                 }
             }
-            
+
             URL url = new URL(address);
             int size;
@@ -100 +100 @@
                 size = downloadConnection.getContentLength();
             }
-            
+
             progressMonitor.setTicksCount(100);
             progressMonitor.subTask(tr("Downloading File {0}: {1} bytes...", file.getName(),size));
-            
+
             in = downloadConnection.getInputStream();
             out = new FileOutputStream(file);
@@ -112 +112 @@
                 out.write(buffer, 0, read);
                 count+=read;
-                if (canceled) break;                            
+                if (canceled) break;
                 p2 = 100 * count / size;
                 if (p2!=p1) {
@@ -142 +142 @@
     }
 
-    @Override 
+    @Override
     protected void realRun() throws SAXException, IOException {
         if (canceled) return;
@@ -160 +160 @@
         return canceled;
     }
-    
+
     /**
      * Recursive unzipping function
@@ -166 +166 @@
      * @param file
      * @param dir
-     * @throws IOException 
+     * @throws IOException
      */
     public static void unzipFileRecursively(File file, String dir) throws IOException {

trunk/src/org/openstreetmap/josm/gui/io/DownloadPrimitivesTask.java

@@ -95 +95 @@
             if (osm == null) {
                 switch (id.getType()) {
-                    case NODE: 
+                    case NODE:
                         osm = new Node(id.getUniqueId());
                         break;
@@ -128 +128 @@
             DataSetMerger merger = new DataSetMerger(ds, theirDataSet);
             merger.merge();
-            
+
             // if incomplete relation members exist, download them too
             for (Relation r : ds.getRelations()) {
@@ -165 +165 @@
                 }
             }
-            
+
         } catch(Exception e) {
             if (canceled) return;
@@ -171 +171 @@
         }
     }
-    
+
     /**
      * replies the set of ids of all primitives for which a fetch request to the

trunk/src/org/openstreetmap/josm/gui/io/RecentlyOpenedFilesMenu.java

@@ -49 +49 @@
         });
     }
-    
+
     private void rebuild() {
         removeAll();

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -56 +56 @@
  * This is a dialog for entering upload options like the parameters for
  * the upload changeset and the strategy for opening/closing a changeset.
- * 
+ *
  */
 public class UploadDialog extends JDialog implements PropertyChangeListener, PreferenceChangedListener{
@@ -111 +111 @@
         //
         pnl.add(pnlUploadedObjects = new UploadedObjectsSummaryPanel(), GBC.eol().fill(GBC.BOTH));
-        
+
         // Custom components
         for (Component c : customComponents) {
@@ -309 +309 @@
     public void setDefaultChangesetTags(Map<String, String> tags) {
         pnlTagSettings.setDefaultTags(tags);
-         for (String key: tags.keySet()) { 
-            if (key.equals("comment")) { 
+         for (String key: tags.keySet()) {
+            if (key.equals("comment")) {
                 changesetCommentModel.setComment(tags.get(key));
-            } 
-        } 
+            }
+        }
     }
 
@@ -370 +370 @@
         super.setVisible(visible);
     }
-    
-    /**
-     * Adds a custom component to this dialog. 
+
+    /**
+     * Adds a custom component to this dialog.
      * Custom components added at JOSM startup are displayed between the objects list and the properties tab pane.
      * @param c The custom component to add. If {@code null}, this method does nothing.

trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java

@@ -264 +264 @@
             putValue(Action.NAME, tr("Cancel"));
             putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
-            getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW) 
-            .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE"); 
+            getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW)
+            .put(KeyStroke.getKeyStroke("ESCAPE"), "ESCAPE");
             getRootPane().getActionMap().put("ESCAPE", this);
             setEnabled(true);