Index: trunk/src/org/openstreetmap/josm/actions/ExitAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/ExitAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/ExitAction.java	(revision 1677)
@@ -28,5 +28,5 @@
             Main.saveGuiGeometry();
             System.exit(0);
-	}
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java	(revision 1677)
@@ -107,5 +107,5 @@
         p.add(warning, GBC.eol().fill(GBC.HORIZONTAL).insets(15,0,0,0));
         addDependencies(author, authorName, email, copyright, predefined, copyrightYear, nameLabel, emailLabel, copyrightLabel, copyrightYearLabel, warning);
-        
+
         // if the user name is not the email address, but the osm user name
         // move it from the email textfield to the author textfield
@@ -119,9 +119,9 @@
         p.add(keywords, GBC.eop().fill(GBC.HORIZONTAL));
 
-        int answer = new ExtendedDialog(Main.parent, 
-                        tr("Export options"), 
+        int answer = new ExtendedDialog(Main.parent,
+                        tr("Export options"),
                         p,
-                        new String[] {tr("Export and Save"), tr("Cancel")}, 
-                        new String[] {"exportgpx.png", "cancel.png"}).getValue();  
+                        new String[] {tr("Export and Save"), tr("Cancel")},
+                        new String[] {"exportgpx.png", "cancel.png"}).getValue();
         if (answer != 1)
             return;
@@ -140,5 +140,5 @@
         else
             gpxData = OsmDataLayer.toGpxData(Main.ds, file);
-        
+
         // add author and copyright details to the gpx data
         if(author.isSelected()) {
@@ -151,11 +151,11 @@
             if(copyrightYear.getText().length() > 0) gpxData.attr.put(GpxData.META_COPYRIGHT_YEAR, copyrightYear.getText());
         }
-        
+
         // add the description to the gpx data
         if(desc.getText().length() > 0) gpxData.attr.put(GpxData.META_DESC, desc.getText());
-        
+
         // add keywords to the gpx data
         if(keywords.getText().length() > 0) gpxData.attr.put(GpxData.META_KEYWORDS, keywords.getText());
-        
+
         try {
             FileOutputStream fo = new FileOutputStream(file);
Index: trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/HistoryInfoAction.java	(revision 1677)
@@ -32,5 +32,5 @@
     /**
      * replies the base URL for browsing the the history of an OSM primitive
-     * 
+     *
      * @return the base URL, i.e. http://api.openstreetmap.org/browse
      */
@@ -43,8 +43,8 @@
         }
         return ret;
-    }    
-    
+    }
+
     public void actionPerformed(ActionEvent e) {
-        final Collection<Object> sel = new LinkedList<Object>();        
+        final Collection<Object> sel = new LinkedList<Object>();
         final String baseUrl  = getBaseURL();
         new AbstractVisitor() {
Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java	(revision 1677)
@@ -145,10 +145,10 @@
         for (HashSet<Node> nodelinks : backlinks.values()) {
             if (!nodelinks.containsAll(allNodes)) {
-                int option = new ExtendedDialog(Main.parent, 
-                        tr("Merge nodes with different memberships?"), 
+                int option = new ExtendedDialog(Main.parent,
+                        tr("Merge nodes with different memberships?"),
                         tr("The selected nodes have differing relation memberships.  "
                             + "Do you still want to merge them?"),
-                        new String[] {tr("Merge Anyway"), tr("Cancel")}, 
-                        new String[] {"mergenodes.png", "cancel.png"}).getValue();  
+                        new String[] {tr("Merge Anyway"), tr("Cancel")},
+                        new String[] {"mergenodes.png", "cancel.png"}).getValue();
                 if (option == 1) break;
                 return null;
@@ -186,9 +186,9 @@
 
         if (!components.isEmpty()) {
-            int answer = new ExtendedDialog(Main.parent, 
-                tr("Enter values for all conflicts."), 
+            int answer = new ExtendedDialog(Main.parent,
+                tr("Enter values for all conflicts."),
                 p,
-                new String[] {tr("Solve Conflicts"), tr("Cancel")}, 
-                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();  
+                new String[] {tr("Solve Conflicts"), tr("Cancel")},
+                new String[] {"dialogs/conflict.png", "cancel.png"}).getValue();
             if (answer != 1)
                 return null;
Index: trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java	(revision 1677)
@@ -43,9 +43,9 @@
         all.add(urltext, GBC.eol());
         all.add(layer, GBC.eol());
-        int answer = new ExtendedDialog(Main.parent, 
-                        tr("Download Location"), 
+        int answer = new ExtendedDialog(Main.parent,
+                        tr("Download Location"),
                         all,
-                        new String[] {tr("Download URL"), tr("Cancel")}, 
-                        new String[] {"download.png", "cancel.png"}).getValue();  
+                        new String[] {tr("Download URL"), tr("Cancel")},
+                        new String[] {"download.png", "cancel.png"}).getValue();
         if (answer != 1) return;
         openUrl(layer.isSelected(), urltext.getText());
Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java	(revision 1677)
@@ -150,7 +150,7 @@
             if (gpxImExporter.acceptFile(file))
                 GpxExportAction.exportGpx(file, layer);
-            else if (osmImExporter.acceptFile(file) 
+            else if (osmImExporter.acceptFile(file)
                     || osmGzipImporter.acceptFile(file)
-                    || osmBzip2Importer.acceptFile(file)) 
+                    || osmBzip2Importer.acceptFile(file))
             {
                 // use a tmp file because if something errors out in the
@@ -171,5 +171,5 @@
                     out = new CBZip2OutputStream(out);
                 }
-                Writer writer = new OutputStreamWriter(out, "UTF-8"); 
+                Writer writer = new OutputStreamWriter(out, "UTF-8");
 
                 OsmWriter w = new OsmWriter(new PrintWriter(writer), false, layer.data.version);
Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java	(revision 1677)
@@ -35,5 +35,5 @@
  *
  * This is the opposite of the MergeNodesAction.
- * 
+ *
  * If a single node is selected, it will copy that node and remove all tags from the old one
  */
@@ -62,5 +62,5 @@
 
         Collection<OsmPrimitive> selection = Main.ds.getSelected();
-        
+
         String errMsg = null;
         if (checkSelection(selection)) {
@@ -121,13 +121,13 @@
                    "own copy and all nodes will be selected.");
         }
-        
+
         if(errMsg != null)
             JOptionPane.showMessageDialog(Main.parent, errMsg);
-        
+
         selectedNode = null;
         selectedWay = null;
         selectedNodes = null;
     }
-    
+
     /**
      * Assumes there is one tagged Node stored in selectedNode that it will try to unglue
@@ -141,8 +141,8 @@
         c.selected = false;
         cmds.add(new ChangeCommand(selectedNode, c));
-        
+
         Node n = new Node(selectedNode);
         n.id = 0;
-        
+
         // If this wasn't called from menu, place it where the cursor is/was
         if(e.getSource() instanceof JPanel) {
@@ -150,20 +150,20 @@
             n.setEastNorth(mv.getEastNorth(mv.lastMEvent.getX(), mv.lastMEvent.getY()));
         }
-        
+
         cmds.add(new AddCommand(n));
-        
+
         fixRelations(selectedNode, cmds, Collections.singletonList(n));
-        
+
         Main.main.undoRedo.add(new SequenceCommand(tr("Unglued Node"), cmds));
         Main.ds.setSelected(n);
         Main.map.mapView.repaint();
     }
-    
+
     /**
      * Checks if selection is suitable for ungluing. This is the case when there's a single,
      * tagged node selected that's part of at least one way (ungluing an unconnected node does
      * not make sense. Due to the call order in actionPerformed, this is only called when the
-     * node is only part of one or less ways. 
-     * 
+     * node is only part of one or less ways.
+     *
      * @param The selection to check against
      * @return Selection is suitable
@@ -184,5 +184,5 @@
         if(!isPartOfWay)
             return false;
-        
+
         selectedNode = (Node)n;
         return  selectedNode.isTagged();
Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java	(revision 1677)
@@ -42,5 +42,5 @@
  * An dialog is displayed asking the user to specify a rectangle to grab.
  * The url and account settings from the preferences are used.
- * 
+ *
  * If the upload fails this action offers various options to resolve conflicts.
  *
@@ -236,5 +236,5 @@
      * Synchronizes the local state of an {@see OsmPrimitive} with its state on the
      * server. The method uses an individual GET for the primitive.
-     * 
+     *
      * @param id the primitive ID
      */
@@ -286,7 +286,7 @@
     /**
      * Synchronizes the local state of the dataset with the state on the server.
-     * 
+     *
      * Reuses the functionality of {@see UpdateDataAction}.
-     * 
+     *
      * @see UpdateDataAction#actionPerformed(ActionEvent)
      */
@@ -299,5 +299,5 @@
      * Handles the case that a conflict in a specific {@see OsmPrimitive} was detected while
      * uploading
-     * 
+     *
      * @param primitiveType  the type of the primitive, either <code>node</code>, <code>way</code> or
      *    <code>relation</code>
@@ -349,5 +349,5 @@
      * Handles the case that a conflict was detected while uploading where we don't
      * know what {@see OsmPrimitive} actually caused the conflict (for whatever reason)
-     * 
+     *
      */
     protected void handleUploadConflictForUnknownConflict() {
@@ -387,5 +387,5 @@
     /**
      * handles an upload conflict, i.e. an error indicated by a HTTP return code 409.
-     * 
+     *
      * @param e  the exception
      */
@@ -404,5 +404,5 @@
     /**
      * Handles an upload error due to a violated precondition, i.e. a HTTP return code 412
-     * 
+     *
      * @param e the exception
      */
@@ -428,11 +428,11 @@
      * {@see OsmPrimitive}, i.e. a HTTP response code 410, where we know what
      * {@see OsmPrimitive} is responsible for the error.
-     * 
+     *
      *  Reuses functionality of the {@see UpdateSelectionAction} to resolve
      *  conflicts due to mismatches in the deleted state.
-     * 
+     *
      * @param primitiveType the type of the primitive
      * @param id the id of the primitive
-     * 
+     *
      * @see UpdateSelectionAction#handlePrimitiveGoneException(long)
      */
@@ -446,5 +446,5 @@
      * {@see OsmPrimitive}, i.e. a HTTP response code 410, where we don't know which
      * {@see OsmPrimitive} is causing the error.
-     * 
+     *
      * @param e the exception
      */
@@ -472,5 +472,5 @@
      * Note that an <strong>update</strong> on an already deleted object results
      * in a 409, not a 410.
-     * 
+     *
      * @param e the exception
      */
@@ -490,5 +490,5 @@
     /**
      * error handler for any exception thrown during upload
-     * 
+     *
      * @param e the exception
      */
@@ -543,5 +543,5 @@
     /**
      * handles an exception caught during OSM API initialization
-     * 
+     *
      * @param e the exception
      */
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java	(revision 1677)
@@ -131,5 +131,5 @@
         return tr("Click to delete. Shift: delete way segment. Alt: don't delete unused nodes when deleting a way. Ctrl: delete referring objects.");
     }
-    
+
     @Override public boolean layerIsSupported(Layer l) {
         return l instanceof OsmDataLayer;
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java	(revision 1677)
@@ -395,11 +395,9 @@
 
         // If the above does not apply, the selection is cleared and a new try is started
-        
-  
-        
+
         boolean extendedWay = false;
         boolean wayIsFinishedTemp = wayIsFinished;
         wayIsFinished = false;
-        
+
         // don't draw lines if shift is held
         if (selection.size() > 0 && !shift) {
@@ -925,5 +923,4 @@
             }
         }
-
         return rv;
     }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java	(revision 1677)
@@ -218,5 +218,5 @@
         mousePos = e.getPoint();
         initialMousePos = e.getPoint();
-        
+
         if(selectedSegment != null)
             Main.ds.setSelected(selectedSegment.way);
@@ -268,7 +268,7 @@
         }
     }
-		
-		@Override public boolean layerIsSupported(Layer l) {
-				return l instanceof OsmDataLayer;
-		}
+
+        @Override public boolean layerIsSupported(Layer l) {
+                return l instanceof OsmDataLayer;
+        }
 }
Index: trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/mapmode/MapMode.java	(revision 1677)
@@ -72,5 +72,5 @@
             Main.map.selectMapMode(this);
     }
-    
+
     // By default, all tools will work with all layers. Can be overwritten to require
     // a special type of layer
Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java	(revision 1677)
@@ -80,5 +80,5 @@
 
         JPanel right = new JPanel();
-        JLabel description = 
+        JLabel description =
         new JLabel("<html><ul>"
                 + "<li>"+tr("<b>Baker Street</b> - 'Baker' and 'Street' in any key or name.")+"</li>"
@@ -110,10 +110,10 @@
         p.add(left);
         p.add(right);
-        
-        int result = new ExtendedDialog(Main.parent, 
-            tr("Search"), 
+
+        int result = new ExtendedDialog(Main.parent,
+            tr("Search"),
             p,
-            new String[] {tr("Start Search"), tr("Cancel")}, 
-            new String[] {"dialogs/search.png", "cancel.png"}).getValue();  
+            new String[] {tr("Start Search"), tr("Cancel")},
+            new String[] {"dialogs/search.png", "cancel.png"}).getValue();
         if(result != 1) return;
 
Index: trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java	(revision 1677)
@@ -19,7 +19,7 @@
  */
 public class GpxData extends WithAttributes {
-    
+
     public static final String META_PREFIX = "meta.";
-    public static final String META_AUTHOR_NAME = META_PREFIX + "author.name"; 
+    public static final String META_AUTHOR_NAME = META_PREFIX + "author.name";
     public static final String META_AUTHOR_EMAIL = META_PREFIX + "author.email";
     public static final String META_AUTHOR_LINK = META_PREFIX + "author.link";
@@ -32,5 +32,5 @@
     public static final String META_NAME = META_PREFIX + "name";
     public static final String META_TIME = META_PREFIX + "time";
-    
+
     public File storageFile;
     public boolean fromServer;
Index: trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 1677)
@@ -3,7 +3,4 @@
 
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
-
-
-
 
 /**
@@ -33,5 +30,3 @@
         return 1;
     }
-    
-    
 }
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 1677)
@@ -278,5 +278,5 @@
      * returns a  primitive with a given id from the data set. null, if no such primitive
      * exists
-     * 
+     *
      * @param id  the id, > 0 required
      * @return the primitive
Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 1677)
@@ -132,5 +132,5 @@
     /**
      * removes all members with member.member == primitive
-     * 
+     *
      * @param primitive the primitive to check for
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 1677)
@@ -21,5 +21,5 @@
     /** the username. */
     public String name;
-    
+
     /** the user ID (since API 0.6) */
     public String uid;
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 1677)
@@ -185,5 +185,5 @@
 
     public boolean isFirstLastNode(Node n) {
-        if (incomplete || nodes.size() == 0) return false; 
+        if (incomplete || nodes.size() == 0) return false;
         return n == firstNode() || n == lastNode();
     }
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/AbstractVisitor.java	(revision 1677)
@@ -6,7 +6,7 @@
 /**
  * This class serves as a base class for most simple visitors,
- * blocking out the "changeset" visit so as to avoid cluttering 
+ * blocking out the "changeset" visit so as to avoid cluttering
  * the visitors which are not interested.
- * 
+ *
  * @author fred
  */
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/CreateOsmChangeVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/CreateOsmChangeVisitor.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/CreateOsmChangeVisitor.java	(revision 1677)
@@ -38,5 +38,5 @@
         // need to set osmConform = false here so that negative IDs get transmitted.
         // this also enables unnecessary and (if the API were more strict) potentially
-        // harmful action="..." attributes. 
+        // harmful action="..." attributes.
         osmwriter = new OsmWriter(writer, false, api.getVersion());
         osmwriter.setChangeset(changeset);
@@ -45,5 +45,5 @@
     // FIXME: This should really NOT use a visitor pattern, it looks
     // stupid. Just have one method named "write" instead of three "visit"s.
-    
+
     public void visit(Node n) {
         if (n.deleted) {
@@ -79,5 +79,5 @@
         }
     }
-    
+
     private void switchMode(String newMode) {
         if ((newMode != null && !newMode.equals(currentMode))||(newMode == null && currentMode != null)) {
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1677)
@@ -268,5 +268,5 @@
             int tmpWidth = (int) (100 /  (float) (circum / realWidth));
             if (tmpWidth > width) width = tmpWidth;
-            
+
             /* if we have a "width" tag, try use it */
             /* (this might be slow and could be improved by caching the value in the Way, on the other hand only used if "real width" is enabled) */
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java	(revision 1677)
@@ -218,15 +218,15 @@
     /**
      * Tries to merge a primitive <code>other</code> into an existing primitive with the same id.
-     * 
-     * @param myPrimitives the complete set of my primitives (potential merge targets) 
+     *
+     * @param myPrimitives the complete set of my primitives (potential merge targets)
      * @param myPrimitivesWithID the map of primitives (potential merge targets) with an id <> 0, for faster lookup
-     *    by id. Key is the id, value the primitive with the given value. myPrimitives.valueSet() is a 
+     *    by id. Key is the id, value the primitive with the given value. myPrimitives.valueSet() is a
      *    subset of primitives.
      * @param other  the other primitive which is to be merged with a primitive in primitives if possible
-     * @return true, if this method was able to merge <code>other</code> with an existing node; false, otherwise  
+     * @return true, if this method was able to merge <code>other</code> with an existing node; false, otherwise
      */
     private <P extends OsmPrimitive> boolean mergeById(
             Collection<P> myPrimitives, HashMap<Long, P> myPrimitivesWithID, P other) {
-        
+
         // merge other into an existing primitive with the same id, if possible
         //
@@ -246,5 +246,5 @@
         }
 
-        // try to merge into one of the existing primitives 
+        // try to merge into one of the existing primitives
         //
         for (P my : myPrimitives) {
Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java	(revision 1677)
@@ -205,4 +205,4 @@
             }
         }
-    }     
- }
+    }
+}
Index: trunk/src/org/openstreetmap/josm/gui/MapFrame.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/MapFrame.java	(revision 1677)
@@ -112,16 +112,16 @@
         statusLine = new MapStatus(this);
     }
-    
+
     public void selectSelectTool(boolean onlyIfModeless) {
         if(onlyIfModeless && !Main.pref.getBoolean("modeless", false))
             return;
-        
+
         selectMapMode((MapMode)getDefaultButtonAction());
     }
-    
+
     public void selectDrawTool(boolean onlyIfModeless) {
         if(onlyIfModeless && !Main.pref.getBoolean("modeless", false))
             return;
-        
+
         Action drawAction = ((AbstractButton)toolBarActions.getComponent(1)).getAction();
         selectMapMode((MapMode)drawAction);
@@ -144,5 +144,5 @@
         // remove menu entries
         Main.main.menu.viewMenu.setVisible(false);
-        
+
         // MapFrame gets destroyed when the last layer is removed, but the status line background
         // thread that collects the information doesn't get destroyed automatically.
Index: trunk/src/org/openstreetmap/josm/gui/MapMover.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapMover.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/MapMover.java	(revision 1677)
@@ -185,8 +185,8 @@
 
         // New center position so that point under the mouse pointer stays the same place as it was before zooming
-        // You will get the formula by simplifying this expression: newCenter = oldCenter + mouseCoordinatesInNewZoom - mouseCoordinatesInOldZoom 
+        // You will get the formula by simplifying this expression: newCenter = oldCenter + mouseCoordinatesInNewZoom - mouseCoordinatesInOldZoom
         double newX = nc.center.east() - (e.getX() - nc.getWidth()/2.0) * (newScale - nc.scale);
         double newY = nc.center.north() + (e.getY() - nc.getHeight()/2.0) * (newScale - nc.scale);
-                      
+
         nc.zoomTo(new EastNorth(newX, newY), newScale);
     }
Index: trunk/src/org/openstreetmap/josm/gui/MapSlider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 1677)
@@ -27,5 +27,5 @@
     public void propertyChange(PropertyChangeEvent evt) {
         if (getModel().getValueIsAdjusting()) return;
-        
+
         double sizex = this.mv.scale * this.mv.getWidth();
         double sizey = this.mv.scale * this.mv.getHeight();
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 1677)
@@ -105,5 +105,5 @@
      */
     public Thread thread;
-    
+
     /**
      * The collector class that waits for notification and then update
@@ -353,5 +353,5 @@
         return "Statusline";
     }
-        
+
     @Override
     public void addMouseListener(MouseListener ml) {
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 1677)
@@ -89,5 +89,5 @@
             @Override public void componentResized(ComponentEvent e) {
                 removeComponentListener(this);
-                
+
                 MapSlider zoomSlider = new MapSlider(MapView.this);
                 add(zoomSlider);
@@ -190,9 +190,9 @@
         return activeLayer != null && activeLayer instanceof OsmDataLayer;
     }
-    
+
     public Boolean isVisibleDrawableLayer() {
         return isDrawableLayer() && activeLayer.visible;
     }
-    
+
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 1677)
@@ -170,5 +170,5 @@
             }
             break;
-        default : 
+        default :
             throw new IllegalStateException("Unknown direction : [0]" + direction);
         }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 1677)
@@ -193,5 +193,5 @@
     /**
      * removes a conflict registered for {@see OsmPrimitive} <code>my</code>
-     * 
+     *
      * @param my the {@see OsmPrimitive} for which a conflict is registered
      *   with this dialog
@@ -209,5 +209,5 @@
      * by a pair of {@see OsmPrimitive} with differences in their tag sets,
      * their node lists (for {@see Way}s) or their member lists (for {@see Relation}s)
-     * 
+     *
      * @param my  my version of the {@see OsmPrimitive}
      * @param their their version of the {@see OsmPrimitive}
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 1677)
@@ -27,5 +27,5 @@
 /**
  * This is an extended dialog for resolving conflict between {@see OsmPrimitive}.
- * 
+ *
  *
  */
@@ -39,5 +39,5 @@
     /**
      * restore position and size on screen from preference settings
-     * 
+     *
      */
     protected void restorePositionAndDimension() {
@@ -79,5 +79,5 @@
     /**
      * remember position and size on screen in the preferences
-     * 
+     *
      */
     protected void rememberPositionAndDimension() {
@@ -104,5 +104,5 @@
     /**
      * builds the sub panel with the control buttons
-     * 
+     *
      * @return the panel
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 1677)
@@ -80,5 +80,5 @@
                         tr("There are unsaved changes. Delete the layer anwyay?"),
                         new String[] {tr("Delete Layer"), tr("Cancel")},
-                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue(); 
+                        new String[] {"dialogs/delete.png", "cancel.png"}).getValue();
 
                     if(result != 1) return;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 1677)
@@ -53,5 +53,5 @@
      */
     private JList displaylist = new JList(list);
-    
+
     private SideButton sbEdit = new SideButton(marktr("Edit"), "edit", "Selection", tr( "Open an editor for the selected relation"), new ActionListener() {
         public void actionPerformed(ActionEvent e) {
@@ -62,5 +62,5 @@
         }
     });
-    
+
     private SideButton sbDel = new SideButton(marktr("Delete"), "delete", "Selection", tr("Delete the selected relation"), new ActionListener() {
         public void actionPerformed(ActionEvent e) {
@@ -68,5 +68,5 @@
             if (toDelete == null)
                 return;
-            
+
             Main.main.undoRedo.add(
                     new DeleteCommand(Collections.singleton(toDelete)));
@@ -102,5 +102,5 @@
         Layer.listeners.add(this);
         add(buttonPanel, BorderLayout.SOUTH);
-        
+
         displaylist.addListSelectionListener(new ListSelectionListener() {
             public void valueChanged(ListSelectionEvent e) {
@@ -130,5 +130,5 @@
             setTitle(tr("Relations"), false);
         }
-        
+
         sbEdit.setEnabled(list.size() > 0);
         sbDel.setEnabled(list.size() > 0);
@@ -185,5 +185,5 @@
         displaylist.removeListSelectionListener(listener);
     }
-    
+
     /**
      * @return The selected relation in the list
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java	(revision 1677)
@@ -262,5 +262,5 @@
                 selectionHistory.removeLast();
         }
-        
+
         int ways = 0;
         int nodes = 0;
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java	(revision 1677)
@@ -15,7 +15,7 @@
 
 public abstract class RelationEditor extends ExtendedDialog {
-    
+
     public static ArrayList<Class<RelationEditor>> editors = new ArrayList<Class<RelationEditor>>();
-    
+
     /**
      * The relation that this editor is working on, and the clone made for
@@ -24,20 +24,20 @@
     protected Relation relation;
     protected Relation clone;
-    
+
     /**
      * This is a factory method that creates an appropriate RelationEditor
-     * instance suitable for editing the relation that was passed in as an 
+     * instance suitable for editing the relation that was passed in as an
      * argument.
-     * 
+     *
      * This method is guaranteed to return a working RelationEditor. If no
-     * specific editor has been registered for the type of relation, then 
+     * specific editor has been registered for the type of relation, then
      * a generic editor will be returned.
      * Allerdings hatte er eine Art, Witwen Trost zuzusprechen und Jungfrauen erbauliche Worte zu sagen, die nicht ganz im Einklang mit seinem geistlichen Berufe stand
      * Editors can be registered by adding their class to the static list "editors"
-     * in the RelationEditor class. When it comes to editing a relation, all 
+     * in the RelationEditor class. When it comes to editing a relation, all
      * registered editors are queried via their static "canEdit" method whether they
      * feel responsible for that kind of relation, and if they return true
      * then an instance of that class will be used.
-     * 
+     *
      * @param r the relation to be edited
      * @return an instance of RelationEditor suitable for editing that kind of relation
@@ -53,11 +53,11 @@
                     return editor;
                 }
-            } catch (Exception ex) { 
-                // plod on 
+            } catch (Exception ex) {
+                // plod on
             }
         }
         return new GenericRelationEditor(r, selectedMembers);
     }
-     
+
     protected RelationEditor(Relation relation, Collection<RelationMember> selectedMembers)
     {
@@ -82,5 +82,5 @@
             // edit an existing relation
             this.clone = new Relation(relation);
-        }    
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 1677)
@@ -17,6 +17,6 @@
 import javax.swing.JTextField;
 import javax.swing.SwingUtilities;
-import javax.swing.event.DocumentListener; 
-import javax.swing.event.DocumentEvent; 
+import javax.swing.event.DocumentListener;
+import javax.swing.event.DocumentEvent;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -73,11 +73,11 @@
             f.addFocusListener(dialogUpdater);
         }
-        
-        class osmUrlRefresher implements DocumentListener { 
-            public void changedUpdate(DocumentEvent e) { parseURL(gui); } 
-            public void insertUpdate(DocumentEvent e) { parseURL(gui); } 
-            public void removeUpdate(DocumentEvent e) { parseURL(gui); } 
-        } 
-        
+
+        class osmUrlRefresher implements DocumentListener {
+            public void changedUpdate(DocumentEvent e) { parseURL(gui); }
+            public void insertUpdate(DocumentEvent e) { parseURL(gui); }
+            public void removeUpdate(DocumentEvent e) { parseURL(gui); }
+        }
+
         KeyListener osmUrlKeyListener = new KeyListener() {
             public void keyPressed(KeyEvent keyEvent) {}
@@ -88,7 +88,7 @@
             public void keyTyped(KeyEvent keyEvent) {}
         };
-        
+
         osmUrl.addKeyListener(osmUrlKeyListener);
-        osmUrl.getDocument().addDocumentListener(new osmUrlRefresher()); 
+        osmUrl.getDocument().addDocumentListener(new osmUrlRefresher());
 
         // select content on receiving focus. this seems to be the default in the
@@ -138,5 +138,5 @@
         updateUrl(gui);
     }
-    
+
     private boolean parseURL(DownloadDialog gui) {
         Bounds b = OsmUrlToBounds.parse(osmUrl.getText());
Index: trunk/src/org/openstreetmap/josm/gui/download/OsmMapControl.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/OsmMapControl.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/download/OsmMapControl.java	(revision 1677)
@@ -26,5 +26,5 @@
  * and centering by double clicking - selecting an area by clicking and dragging
  * the mouse
- * 
+ *
  * @author Tim Haussmann
  */
Index: trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java	(revision 1677)
@@ -33,7 +33,7 @@
 /**
  * JComponent that displays the slippy map tiles
- * 
+ *
  * @author Tim Haussmann
- * 
+ *
  */
 public class SlippyMapChooser extends JMapViewer implements DownloadSelection {
@@ -70,6 +70,6 @@
         setMapMarkerVisible(false);
         setMinimumSize(new Dimension(350, 350 / 2));
-        // We need to set an initial size - this prevents a wrong zoom selection for 
-        // the area before the component has been displayed the first time   
+        // We need to set an initial size - this prevents a wrong zoom selection for
+        // the area before the component has been displayed the first time
         setBounds(new Rectangle(getMinimumSize()));
         setFileCacheEnabled(Main.pref.getBoolean("slippy_map_chooser.file_cache", true));
@@ -180,5 +180,5 @@
      * Callback for the OsmMapControl. (Re-)Sets the start and end point of the
      * selection rectangle.
-     * 
+     *
      * @param aStart
      * @param aEnd
Index: trunk/src/org/openstreetmap/josm/gui/download/SourceButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/SourceButton.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/download/SourceButton.java	(revision 1677)
@@ -43,5 +43,5 @@
                         - imageMapnik.getIconWidth(), y, null);
             }else if(currentMap == CYCLEMAP){
-            	 g.drawImage(imageCycleMap.getImage(), g.getClipBounds().width
+                 g.drawImage(imageCycleMap.getImage(), g.getClipBounds().width
                          - imageCycleMap.getIconWidth(), y, null);
             }
Index: trunk/src/org/openstreetmap/josm/gui/historycombobox/ComboBoxHistory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/historycombobox/ComboBoxHistory.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/historycombobox/ComboBoxHistory.java	(revision 1677)
@@ -1,17 +1,17 @@
 /* Copyright (c) 2008, Henrik Niehaus
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- *    this list of conditions and the following disclaimer in the documentation 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its 
- *    contributors may be used to endorse or promote products derived from this 
+ * 3. Neither the name of the project nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
  *    software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -37,74 +37,74 @@
 public class ComboBoxHistory extends DefaultComboBoxModel implements Iterable<String> {
 
-	private int maxSize = 10;
-	
-	private List<HistoryChangedListener> listeners = new ArrayList<HistoryChangedListener>();
-	
-	public ComboBoxHistory(int size) {
-		maxSize = size;
-	}
-	
-	/**
-	 * Adds or moves an element to the top of the history
-	 */
-	public void addElement(Object o) {
-		String newEntry = (String)o;
-		
-		// if history contains this object already, delete it,
-		// so that it looks like a move to the top
-		for (int i = 0; i < getSize(); i++) {
-			String oldEntry = (String) getElementAt(i);
-			if(oldEntry.equals(newEntry)) {
-				removeElementAt(i);
-			}
-		}
-		
-		// insert element at the top
-		insertElementAt(o, 0);
-		
-		// remove an element, if the history gets too large
-		if(getSize()> maxSize) {
-			removeElementAt(getSize()-1);
-		}
-		
-		// set selected item to the one just added
-		setSelectedItem(o);
-		
-		fireHistoryChanged();
-	}
-	
-	public Iterator<String> iterator() {
-		return new Iterator<String>() {
+    private int maxSize = 10;
 
-			private int position = -1;
-			
-			public void remove() {
-				removeElementAt(position);
-			}
+    private List<HistoryChangedListener> listeners = new ArrayList<HistoryChangedListener>();
 
-			public boolean hasNext() {
-				if(position < getSize()-1 && getSize()>0) {
-					return true;
-				}
-				return false;
-			}
+    public ComboBoxHistory(int size) {
+        maxSize = size;
+    }
 
-			public String next() {
-				position++;
-				return getElementAt(position).toString();
-			}
-			
-		};
-	}
+    /**
+     * Adds or moves an element to the top of the history
+     */
+    public void addElement(Object o) {
+        String newEntry = (String)o;
 
-	public void setItems(List<String> items) {
-	    removeAllElements();
-	    Collections.reverse(items);
-	    for (String item : items) {
+        // if history contains this object already, delete it,
+        // so that it looks like a move to the top
+        for (int i = 0; i < getSize(); i++) {
+            String oldEntry = (String) getElementAt(i);
+            if(oldEntry.equals(newEntry)) {
+                removeElementAt(i);
+            }
+        }
+
+        // insert element at the top
+        insertElementAt(o, 0);
+
+        // remove an element, if the history gets too large
+        if(getSize()> maxSize) {
+            removeElementAt(getSize()-1);
+        }
+
+        // set selected item to the one just added
+        setSelectedItem(o);
+
+        fireHistoryChanged();
+    }
+
+    public Iterator<String> iterator() {
+        return new Iterator<String>() {
+
+            private int position = -1;
+
+            public void remove() {
+                removeElementAt(position);
+            }
+
+            public boolean hasNext() {
+                if(position < getSize()-1 && getSize()>0) {
+                    return true;
+                }
+                return false;
+            }
+
+            public String next() {
+                position++;
+                return getElementAt(position).toString();
+            }
+
+        };
+    }
+
+    public void setItems(List<String> items) {
+        removeAllElements();
+        Collections.reverse(items);
+        for (String item : items) {
             addElement(item);
         }
-	    Collections.reverse(items);
-	}
-	
+        Collections.reverse(items);
+    }
+
     public List<String> asList() {
         List<String> list = new ArrayList<String>(maxSize);
@@ -114,13 +114,13 @@
         return list;
     }
-    
+
     public void addHistoryChangedListener(HistoryChangedListener l) {
         listeners.add(l);
     }
-    
+
     public void removeHistoryChangedListener(HistoryChangedListener l) {
         listeners.remove(l);
     }
-    
+
     private void fireHistoryChanged() {
         for (HistoryChangedListener l : listeners) {
Index: trunk/src/org/openstreetmap/josm/gui/historycombobox/EventConsumingPlainDocument.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/historycombobox/EventConsumingPlainDocument.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/historycombobox/EventConsumingPlainDocument.java	(revision 1677)
@@ -1,17 +1,17 @@
 /* Copyright (c) 2008, Henrik Niehaus
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- *    this list of conditions and the following disclaimer in the documentation 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its 
- *    contributors may be used to endorse or promote products derived from this 
+ * 3. Neither the name of the project nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
  *    software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -33,42 +33,42 @@
 
 public class EventConsumingPlainDocument extends PlainDocument {
-	private boolean consumeEvents;
+    private boolean consumeEvents;
 
-	public boolean isConsumeEvents() {
-		return consumeEvents;
-	}
+    public boolean isConsumeEvents() {
+        return consumeEvents;
+    }
 
-	public void setConsumeEvents(boolean consumeEvents) {
-		this.consumeEvents = consumeEvents;
-	}
+    public void setConsumeEvents(boolean consumeEvents) {
+        this.consumeEvents = consumeEvents;
+    }
 
-	@Override
-	protected void fireChangedUpdate(DocumentEvent e) {
-		if(!consumeEvents) {
-			super.fireChangedUpdate(e);
-		}
-	}
+    @Override
+    protected void fireChangedUpdate(DocumentEvent e) {
+        if(!consumeEvents) {
+            super.fireChangedUpdate(e);
+        }
+    }
 
-	@Override
-	protected void fireInsertUpdate(DocumentEvent e) {
-		if(!consumeEvents) {
-			super.fireInsertUpdate(e);
-		}
-	}
+    @Override
+    protected void fireInsertUpdate(DocumentEvent e) {
+        if(!consumeEvents) {
+            super.fireInsertUpdate(e);
+        }
+    }
 
-	@Override
-	protected void fireRemoveUpdate(DocumentEvent e) {
-		if(!consumeEvents) {
-			super.fireRemoveUpdate(e);
-		}
-	}
+    @Override
+    protected void fireRemoveUpdate(DocumentEvent e) {
+        if(!consumeEvents) {
+            super.fireRemoveUpdate(e);
+        }
+    }
 
-	@Override
-	protected void fireUndoableEditUpdate(UndoableEditEvent e) {
-		if(!consumeEvents) {
-			super.fireUndoableEditUpdate(e);
-		}
-	}
-	
-	
+    @Override
+    protected void fireUndoableEditUpdate(UndoableEditEvent e) {
+        if(!consumeEvents) {
+            super.fireUndoableEditUpdate(e);
+        }
+    }
+
+
 }
Index: trunk/src/org/openstreetmap/josm/gui/historycombobox/HistoryChangedListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/historycombobox/HistoryChangedListener.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/historycombobox/HistoryChangedListener.java	(revision 1677)
@@ -1,17 +1,17 @@
 /* Copyright (c) 2008, Henrik Niehaus
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- *    this list of conditions and the following disclaimer in the documentation 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its 
- *    contributors may be used to endorse or promote products derived from this 
+ * 3. Neither the name of the project nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
  *    software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Index: trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestionListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestionListener.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/historycombobox/SuggestionListener.java	(revision 1677)
@@ -1,17 +1,17 @@
 /* Copyright (c) 2008, Henrik Niehaus
  * All rights reserved.
- * 
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
- * 
+ *
  * 1. Redistributions of source code must retain the above copyright notice,
  *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- *    this list of conditions and the following disclaimer in the documentation 
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
  *    and/or other materials provided with the distribution.
- * 3. Neither the name of the project nor the names of its 
- *    contributors may be used to endorse or promote products derived from this 
+ * 3. Neither the name of the project nor the names of its
+ *    contributors may be used to endorse or promote products derived from this
  *    software without specific prior written permission.
- * 
+ *
  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -30,8 +30,8 @@
 public interface SuggestionListener {
 
-	/**
-	 * Invoked, if an attempt to suggest text has been made
-	 * @param suggestion The suggested text or null if no suggestion could be found
-	 */
-	public void suggested(String suggestion);
+    /**
+     * Invoked, if an attempt to suggest text has been made
+     * @param suggestion The suggested text or null if no suggestion could be found
+     */
+    public void suggested(String suggestion);
 }
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 1677)
@@ -240,5 +240,5 @@
      * merges the primitives in dataset <code>from</code> into the dataset of
      * this layer
-     * 
+     *
      * @param from  the source data set
      */
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/AudioMarker.java	(revision 1677)
@@ -21,5 +21,5 @@
     public  double syncOffset;
     public boolean timeFromAudio = false; // as opposed to from the GPX track
-    
+
     /**
      * Verifies the parameter whether a new AudioMarker can be created and return
Index: trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 1677)
@@ -43,5 +43,5 @@
         JPanel p = gui.createPreferenceTab("advanced", tr("Advanced Preferences"),
                 tr("Setting Preference entries directly. Use with caution!"), false);
-        
+
         txtFilter = new JTextField();
         JLabel lbFilter = new JLabel(tr("Search: "));
@@ -53,13 +53,13 @@
                 action();
             }
-            
+
             public void insertUpdate(DocumentEvent e) {
                 action();
             }
-            
+
             public void removeUpdate(DocumentEvent e) {
                 action();
             }
-            
+
             private void action() {
                 dataToModel();
@@ -152,5 +152,5 @@
         }
     }
-    
+
     private void dataToModel() {
         while (model.getRowCount() > 0) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetMenu.java	(revision 1677)
@@ -49,59 +49,59 @@
         }
     }
-	/**
-	 * Sorts the menu items using the translated item text
-	 */
-	public void sortMenu(){
-		TaggingPresetMenu.sortMenu(this.menu);
-	}
+    /**
+     * Sorts the menu items using the translated item text
+     */
+    public void sortMenu(){
+        TaggingPresetMenu.sortMenu(this.menu);
+    }
 
-	/**
-	 * Sorts the menu items using the translated item text
-	 */
-	public static void sortMenu(JMenu menu){
-		Component[] items = menu.getMenuComponents();
-		PresetTextComparator comp = new PresetTextComparator();
-		ArrayList<JMenuItem> sortarray = new ArrayList<JMenuItem>();
-		int lastSeperator = 0;
-		for (int i = 0; i < items.length; i++) {
-			Object item = items[i];
-			if (item instanceof JMenu){
-				sortMenu((JMenu)item);
-			}			
-			if (item instanceof JMenuItem){
-				sortarray.add((JMenuItem)item);
-				if (i == items.length-1){
-					Collections.sort(sortarray, comp);
-					int pos = 0;
-					for (JMenuItem menuItem : sortarray) {
-						int oldPos;
-						if(lastSeperator == 0){
-							oldPos=pos;
-						}else {
-							oldPos = pos+lastSeperator+1;
-						}
-						menu.add(menuItem, oldPos);
-						pos++;
-					}
-					sortarray = new ArrayList<JMenuItem>();
-					lastSeperator = 0;
-				}
-			}else if (item instanceof JSeparator){
-				Collections.sort(sortarray, comp);
-				int pos = 0;
-				for (JMenuItem menuItem : sortarray) {
-					int oldPos;
-					if(lastSeperator == 0){
-						oldPos=pos;
-					}else {
-						oldPos = pos+lastSeperator+1;
-					}
-					menu.add(menuItem, oldPos);
-					pos++;
-				}
-				sortarray = new ArrayList<JMenuItem>();
-				lastSeperator = i;
-			}
-		}
-	}
+    /**
+     * Sorts the menu items using the translated item text
+     */
+    public static void sortMenu(JMenu menu){
+        Component[] items = menu.getMenuComponents();
+        PresetTextComparator comp = new PresetTextComparator();
+        ArrayList<JMenuItem> sortarray = new ArrayList<JMenuItem>();
+        int lastSeperator = 0;
+        for (int i = 0; i < items.length; i++) {
+            Object item = items[i];
+            if (item instanceof JMenu){
+                sortMenu((JMenu)item);
+            }
+            if (item instanceof JMenuItem){
+                sortarray.add((JMenuItem)item);
+                if (i == items.length-1){
+                    Collections.sort(sortarray, comp);
+                    int pos = 0;
+                    for (JMenuItem menuItem : sortarray) {
+                        int oldPos;
+                        if(lastSeperator == 0){
+                            oldPos=pos;
+                        }else {
+                            oldPos = pos+lastSeperator+1;
+                        }
+                        menu.add(menuItem, oldPos);
+                        pos++;
+                    }
+                    sortarray = new ArrayList<JMenuItem>();
+                    lastSeperator = 0;
+                }
+            }else if (item instanceof JSeparator){
+                Collections.sort(sortarray, comp);
+                int pos = 0;
+                for (JMenuItem menuItem : sortarray) {
+                    int oldPos;
+                    if(lastSeperator == 0){
+                        oldPos=pos;
+                    }else {
+                        oldPos = pos+lastSeperator+1;
+                    }
+                    menu.add(menuItem, oldPos);
+                    pos++;
+                }
+                sortarray = new ArrayList<JMenuItem>();
+                lastSeperator = i;
+            }
+        }
+    }
 }
Index: trunk/src/org/openstreetmap/josm/io/GpxWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxWriter.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/io/GpxWriter.java	(revision 1677)
@@ -46,6 +46,6 @@
         out.println("<?xml version='1.0' encoding='UTF-8'?>");
         out.println("<gpx version=\"1.1\" creator=\"JOSM GPX export\" xmlns=\"http://www.topografix.com/GPX/1/1\"\n" +
-        		"    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" + 
-        		"    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");
+                "    xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" \n" +
+                "    xsi:schemaLocation=\"http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd\">");
         indent = "  ";
         writeMetaData();
@@ -60,5 +60,5 @@
         // FIXME this loop is evil, because it does not assure the
         // correct element order specified by the xml schema.
-        // for now it works, but future extension could get very complex and unmaintainable 
+        // for now it works, but future extension could get very complex and unmaintainable
         for (Map.Entry<String, Object> ent : attr.entrySet()) {
             String k = ent.getKey();
@@ -76,10 +76,10 @@
         Map<String, Object> attr = data.attr;
         openln("metadata");
-        
+
         // write the description
         if (attr.containsKey(GpxData.META_DESC)) simpleTag("desc", (String)attr.get(GpxData.META_DESC));
-        
+
         // write the author details
-        if (attr.containsKey(GpxData.META_AUTHOR_NAME) 
+        if (attr.containsKey(GpxData.META_AUTHOR_NAME)
                 || attr.containsKey(GpxData.META_AUTHOR_EMAIL)) {
             openln("author");
@@ -99,5 +99,5 @@
 
         // write the copyright details
-        if(attr.containsKey(GpxData.META_COPYRIGHT_LICENSE) 
+        if(attr.containsKey(GpxData.META_COPYRIGHT_LICENSE)
                 || attr.containsKey(GpxData.META_COPYRIGHT_YEAR)) {
             openAtt("copyright", "author=\""+ attr.get(GpxData.META_COPYRIGHT_AUTHOR) +"\"");
@@ -110,5 +110,5 @@
             closeln("copyright");
         }
-        
+
         // write links
         if(attr.containsKey(GpxData.META_LINKS)) {
@@ -117,6 +117,6 @@
             }
         }
-        
-        // write keywords 
+
+        // write keywords
         if (attr.containsKey(GpxData.META_KEYWORDS)) simpleTag("keywords", (String)attr.get(GpxData.META_KEYWORDS));
 
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 1677)
@@ -55,9 +55,9 @@
     /**
      * replies the {@see OsmApi} for a given server URL
-     * 
+     *
      * @param serverUrl  the server URL
      * @return the OsmApi
      * @throws IllegalArgumentException thrown, if serverUrl is null
-     * 
+     *
      */
     static public OsmApi getOsmApi(String serverUrl) {
@@ -71,8 +71,8 @@
     /**
      * replies the {@see OsmApi} for the URL given by the preference <code>osm-server.url</code>
-     * 
+     *
      * @return the OsmApi
      * @exception IllegalStateException thrown, if the preference <code>osm-server.url</code> is not set
-     * 
+     *
      */
     static public OsmApi getOsmApi() {
@@ -125,5 +125,5 @@
     /**
      * creates an OSM api for a specific server URL
-     * 
+     *
      * @param serverUrl the server URL. Must not be null
      * @exception IllegalArgumentException thrown, if serverUrl is null
@@ -466,5 +466,5 @@
      * notifies any listeners about the current state of this API. Currently just
      * displays the message in the global progress dialog, see {@see Main#pleaseWaitDlg}
-     * 
+     *
      * @param message a status message.
      */
@@ -476,5 +476,5 @@
      * notifies any listeners about the current about a relative progress. Currently just
      * increments the progress monitor in the in the global progress dialog, see {@see Main#pleaseWaitDlg}
-     * 
+     *
      * @param int the delta
      */
Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 1677)
@@ -158,12 +158,12 @@
                               throw new SAXException(tr("Unknown version"));
                          String v = atts.getValue("version");
-                         if (v == null) 
+                         if (v == null)
                              throw new SAXException(tr("Version number missing from OSM data"));
-                         if (!(v.equals("0.5") || v.equals("0.6"))) 
+                         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");
                          ds.version = v;
-                         
+
                     } else if (qName.equals("bounds")) {
                          // new style bounds.
@@ -234,5 +234,5 @@
                          value = atts.getValue("role");
                          emd.relationMember.role = value;
-                         
+
                          if (emd.id == 0)
                               throw new SAXException(tr("Incomplete <member> specification with ref=0"));
@@ -285,6 +285,6 @@
                current.user = User.get(user);
           }
-          
-          // uid attribute added in 0.6 API 
+
+          // uid attribute added in 0.6 API
           String uid = atts.getValue("uid");
           if (uid != null) {
@@ -484,5 +484,5 @@
 
           Main.pleaseWaitDlg.currentAction.setText(tr("Prepare OSM data..."));
-          Main.pleaseWaitDlg.setIndeterminate(true); 
+          Main.pleaseWaitDlg.setIndeterminate(true);
 
 //          System.out.println("Parser finished: Tags " + tagsN + " Nodes " + nodesN + " Ways " + waysN +
@@ -506,6 +506,6 @@
 
 //          System.out.println("Data loaded!");
-          Main.pleaseWaitDlg.setIndeterminate(false); 
-          Main.pleaseWaitDlg.progress.setValue(0); 
+          Main.pleaseWaitDlg.setIndeterminate(false);
+          Main.pleaseWaitDlg.progress.setValue(0);
 
           return osm;
Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 1677)
@@ -62,5 +62,5 @@
     /**
      * retrieves the most recent changeset comment from the preferences
-     * 
+     *
      * @return the most recent changeset comment
      */
@@ -77,5 +77,5 @@
     /**
      * Send the dataset to the server.
-     * 
+     *
      * @param apiVersion version of the data set
      * @param primitives list of objects to send
Index: trunk/src/org/openstreetmap/josm/io/XmlWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/XmlWriter.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/io/XmlWriter.java	(revision 1677)
@@ -13,9 +13,9 @@
 
     protected PrintWriter out;
-    
+
     public XmlWriter(PrintWriter out) {
         this.out = out;
     }
-    
+
     /**
      * Encode the given string in XML1.0 format.
Index: trunk/src/org/openstreetmap/josm/tools/AudioUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioUtil.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/tools/AudioUtil.java	(revision 1677)
@@ -20,9 +20,9 @@
  */
 public class AudioUtil {
-	
-	static public double getCalibratedDuration(File wavFile) {
+
+    static public double getCalibratedDuration(File wavFile) {
         try {
-        	AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(
-        			new URL("file:".concat(wavFile.getAbsolutePath())));
+            AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(
+                    new URL("file:".concat(wavFile.getAbsolutePath())));
             AudioFormat audioFormat = audioInputStream.getFormat();
             long filesize = wavFile.length();
@@ -34,8 +34,6 @@
             return naturalLength / calibration;
         } catch (Exception e) {
-        	return 0.0;
+            return 0.0;
         }
-	}
-	
+    }
 }
- 
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 1677)
@@ -229,5 +229,5 @@
     }
 
-/* from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/ 
+/* from: http://www.jidesoft.com/blog/2008/02/29/rotate-an-icon-in-java/
 * License: "feel free to use"
 */
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 1677)
@@ -1,48 +1,48 @@
-// License: GPL. Copyright 2007 by Immanuel Scholz and others 
-package org.openstreetmap.josm.tools; 
- 
-import java.util.HashMap; 
- 
-import org.openstreetmap.josm.data.Bounds; 
-import org.openstreetmap.josm.data.coor.LatLon; 
- 
-public class OsmUrlToBounds { 
-    public static Bounds parse(String url) { 
-        int i = url.indexOf('?'); 
-        if (i == -1) 
-            return null; 
-        String[] args = url.substring(i+1).split("&"); 
-        HashMap<String, String> map = new HashMap<String, String>(); 
-        for (String arg : args) { 
-            int eq = arg.indexOf('='); 
-            if (eq != -1) { 
-                map.put(arg.substring(0, eq), arg.substring(eq + 1)); 
-            } 
-        } 
- 
-        Bounds b = null; 
-        try { 
-            if (map.containsKey("bbox")) { 
-                String bbox[] = map.get("bbox").split(","); 
-                b = new Bounds( 
-                    new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])), 
-                    new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2]))); 
- 
-            } else { 
-                double size = 180.0 / Math.pow(2, Integer.parseInt(map.get("zoom"))); 
-                b = new Bounds( 
-                    new LatLon(parseDouble(map, "lat") - size/2, parseDouble(map, "lon") - size), 
-                    new LatLon(parseDouble(map, "lat") + size/2, parseDouble(map, "lon") + size)); 
-            } 
-        } catch (NumberFormatException x) { 
-        } catch (NullPointerException x) { 
-        } 
-        return b; 
-    } 
-     
-    private static double parseDouble(HashMap<String, String> map, String key) { 
-        if (map.containsKey(key)) 
-            return Double.parseDouble(map.get(key)); 
-        return Double.parseDouble(map.get("m"+key)); 
-    } 
+// License: GPL. Copyright 2007 by Immanuel Scholz and others
+package org.openstreetmap.josm.tools;
+
+import java.util.HashMap;
+
+import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.LatLon;
+
+public class OsmUrlToBounds {
+    public static Bounds parse(String url) {
+        int i = url.indexOf('?');
+        if (i == -1)
+            return null;
+        String[] args = url.substring(i+1).split("&");
+        HashMap<String, String> map = new HashMap<String, String>();
+        for (String arg : args) {
+            int eq = arg.indexOf('=');
+            if (eq != -1) {
+                map.put(arg.substring(0, eq), arg.substring(eq + 1));
+            }
+        }
+
+        Bounds b = null;
+        try {
+            if (map.containsKey("bbox")) {
+                String bbox[] = map.get("bbox").split(",");
+                b = new Bounds(
+                    new LatLon(Double.parseDouble(bbox[1]), Double.parseDouble(bbox[0])),
+                    new LatLon(Double.parseDouble(bbox[3]), Double.parseDouble(bbox[2])));
+
+            } else {
+                double size = 180.0 / Math.pow(2, Integer.parseInt(map.get("zoom")));
+                b = new Bounds(
+                    new LatLon(parseDouble(map, "lat") - size/2, parseDouble(map, "lon") - size),
+                    new LatLon(parseDouble(map, "lat") + size/2, parseDouble(map, "lon") + size));
+            }
+        } catch (NumberFormatException x) {
+        } catch (NullPointerException x) {
+        }
+        return b;
+    }
+
+    private static double parseDouble(HashMap<String, String> map, String key) {
+        if (map.containsKey(key))
+            return Double.parseDouble(map.get(key));
+        return Double.parseDouble(map.get("m"+key));
+    }
 }
Index: trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java	(revision 1676)
+++ trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java	(revision 1677)
@@ -6,8 +6,8 @@
 
 public class PresetTextComparator implements Comparator<JMenuItem> {
-	//TODO add error checking and stuff
-	public int compare(JMenuItem arg0, JMenuItem arg1) {
-		return arg0.getText().compareTo(arg1.getText());
-	}
+    //TODO add error checking and stuff
+    public int compare(JMenuItem arg0, JMenuItem arg1) {
+        return arg0.getText().compareTo(arg1.getText());
+    }