Index: trunk/src/org/openstreetmap/josm/Main.java =================================================================== --- trunk/src/org/openstreetmap/josm/Main.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/Main.java (revision 2512) @@ -74,5 +74,5 @@ * Replies true if JOSM currently displays a map view. False, if it doesn't, i.e. if * it only shows the MOTD panel. - * + * * @return true if JOSM currently displays a map view */ @@ -128,5 +128,4 @@ */ public static ToolbarPreferences toolbar; - public UndoRedoHandler undoRedo = new UndoRedoHandler(); @@ -336,5 +335,4 @@ CoordinateFormat.setCoordinateFormat(CoordinateFormat.DECIMAL_DEGREES); } - Dimension screenDimension = Toolkit.getDefaultToolkit().getScreenSize(); Index: trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 2512) @@ -25,8 +25,7 @@ public abstract class AbstractMergeAction extends JosmAction { - /** * the list cell renderer used to render layer list entries - * + * */ static public class LayerListCellRenderer extends DefaultListCellRenderer { Index: trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java (revision 2512) @@ -81,3 +81,2 @@ } - Index: trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java (revision 2512) @@ -98,5 +98,5 @@ * such layer exists, either because the layer list dialog is not yet created * or because no layer is selected. - * + * * @return the first selected layer in the layer list dialog */ Index: trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (revision 2512) @@ -49,5 +49,4 @@ } - protected void onPostDownloadOpenChangesets(DownloadOpenChangesetsTask task) { if (task.isCancelled() || task.getLastException() != null) return; @@ -75,5 +74,4 @@ } - private class DownloadOpenChangesetsTask extends PleaseWaitRunnable { @@ -85,5 +83,5 @@ /** - * + * * @param model provides the user id of the current user and accepts the changesets * after download @@ -116,5 +114,5 @@ * Fetch the user info from the server. This is necessary if we don't know * the users id yet - * + * * @return the user info * @throws OsmTransferException thrown in case of any communication exception Index: trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/CombineWayAction.java (revision 2512) @@ -90,5 +90,4 @@ } - public void combineWays(Collection ways) { @@ -219,5 +218,5 @@ * This is a collection of relations referring to at least one out of a set of * ways. - * + * * */ @@ -230,5 +229,5 @@ /** - * + * * @param ways a collection of ways */ @@ -246,5 +245,5 @@ /** * build the sets of referring relations from the relations in the dataset ds - * + * * @param ds the data set */ @@ -273,5 +272,5 @@ /** * Replies the set of referring relations - * + * * @return the set of referring relations */ @@ -286,5 +285,5 @@ /** * Replies the set of referring relations for a specific way - * + * * @return the set of referring relations */ @@ -412,5 +411,4 @@ } - static public class NodeGraph { static public List buildNodePairs(Way way, boolean directed) { @@ -480,5 +478,4 @@ private HashMap> successors; private HashMap> predecessors; - protected void rememberSuccessor(NodePair pair) { @@ -612,7 +609,7 @@ /** * Tries to find a spanning path starting from node startNode. - * + * * Traverses the path in depth-first order. - * + * * @param startNode the start node * @return the spanning path; null, if no path is found @@ -641,5 +638,5 @@ * Tries to find a path through the graph which visits each edge (i.e. * the segment of a way) exactly one. - * + * * @return the path; null, if no path was found */ Index: trunk/src/org/openstreetmap/josm/actions/DownloadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/DownloadAction.java (revision 2512) @@ -28,5 +28,5 @@ public class DownloadAction extends JosmAction { private static final Logger logger = Logger.getLogger(DownloadAction.class.getName()); - + public DownloadAction() { super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."), @@ -41,5 +41,5 @@ if (! dialog.isCanceled()) { dialog.rememberSettings(); - Bounds area = dialog.getSelectedDownloadArea(); + Bounds area = dialog.getSelectedDownloadArea(); if (dialog.isDownloadOsmData()) { DownloadOsmTask task = new DownloadOsmTask(); @@ -52,5 +52,5 @@ Main.worker.submit(new PostDownloadHandler(task, future)); } - } - } + } + } } Index: trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java (revision 2512) @@ -74,5 +74,5 @@ * Downloads the primitives referring to the primitive given by id and * type. - * + * * * @param targetLayer the target layer. Must not be null. @@ -118,8 +118,8 @@ /** * constructor - * + * * @param targetLayer the target layer for the downloaded primitives. Must not be null. * @param children the collection of child primitives for which parents are to be downloaded - * + * */ public DownloadReferrersTask(OsmDataLayer targetLayer, Collection children) { @@ -142,9 +142,9 @@ /** * constructor - * + * * @param targetLayer the target layer for the downloaded primitives. Must not be null. * @param primitives the collection of children for which parents are to be downloaded. Children * are specified by their id and their type. - * + * */ public DownloadReferrersTask(OsmDataLayer targetLayer, Map children) { @@ -167,5 +167,5 @@ /** * constructor - * + * * @param targetLayer the target layer. Must not be null. * @param id the primitive id. id > 0 required. @@ -174,5 +174,5 @@ * @exception IllegalArgumentException thrown if type == null * @exception IllegalArgumentException thrown if targetLayer == null - * + * */ public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException { Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 2512) @@ -38,7 +38,7 @@ */ public static ArrayList importers; - + public static ArrayList exporters; - + // add some file types only if the relevant classes are there; // this gives us the option to painlessly drop them from the .jar @@ -48,5 +48,5 @@ importers = new ArrayList(); - + String[] importerNames = { "org.openstreetmap.josm.io.OsmImporter", @@ -62,5 +62,5 @@ Class klass = Class.forName(classname); importers.add((FileImporter)klass.newInstance()); - } catch (Exception e) {} + } catch (Exception e) {} } @@ -78,5 +78,5 @@ Class klass = Class.forName(classname); exporters.add((FileExporter)klass.newInstance()); - } catch (Exception e) {} + } catch (Exception e) {} } } @@ -85,5 +85,4 @@ private final String description; private final String defaultExtension; - static protected void sort(List filters) { @@ -105,5 +104,5 @@ * The list is ordered according to their description, an {@see AllFormatsImporter} * is append at the end. - * + * * @return an ordered list of {@see ExtensionFileFilter}s for importing. */ @@ -124,5 +123,5 @@ * The list is ordered according to their description, an {@see AllFormatsImporter} * is append at the end. - * + * * @return an ordered list of {@see ExtensionFileFilter}s for exporting. */ @@ -141,5 +140,5 @@ /** * Replies the default {@see ExtensionFileFilter} for a given extension - * + * * @param extension the extension * @return the default {@see ExtensionFileFilter} for a given extension @@ -156,5 +155,5 @@ /** * Replies the default {@see ExtensionFileFilter} for a given extension - * + * * @param extension the extension * @return the default {@see ExtensionFileFilter} for a given extension @@ -172,5 +171,5 @@ * Applies the choosable {@see FileFilter} to a {@see JFileChooser} before using the * file chooser for selecting a file for reading. - * + * * @param fileChooser the file chooser * @param extension the default extension @@ -186,5 +185,5 @@ * Applies the choosable {@see FileFilter} to a {@see JFileChooser} before using the * file chooser for selecting a file for writing. - * + * * @param fileChooser the file chooser * @param extension the default extension Index: trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java (revision 2512) @@ -24,5 +24,4 @@ */ public class GpxExportAction extends DiskAccessAction { - public GpxExportAction() { @@ -61,5 +60,5 @@ * layer must not be null. layer must be an instance of * {@see OsmDataLayer} or {@see GpxLayer}. - * + * * @param layer the layer * @exception IllegalArgumentException thrown if layer is null @@ -94,6 +93,6 @@ @Override protected void updateEnabledState() { - boolean check = - Main.isDisplayingMapView() + boolean check = + Main.isDisplayingMapView() && Main.map.mapView.getActiveLayer() != null; if(!check) { Index: trunk/src/org/openstreetmap/josm/actions/InfoAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/InfoAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/InfoAction.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/JosmAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/JosmAction.java (revision 2512) @@ -101,6 +101,4 @@ } - - /** * needs to be overridden to be useful Index: trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java (revision 2512) @@ -40,5 +40,5 @@ /** * Merges a collection of nodes into one node. - * + * */ public class MergeNodesAction extends JosmAction { @@ -77,5 +77,5 @@ * The last selected node will become the target node the remaining * nodes are merged to. - * + * * @param candidates the collection of candidate nodes * @return the selected target node @@ -92,5 +92,5 @@ * Merges the nodes in node onto one of the nodes. Uses the dataset * managed by layer as reference. - * + * * @param layer the reference data layer. Must not be null. * @param nodes the collection of nodes. Ignored if null. @@ -98,5 +98,5 @@ * @throws IllegalArgumentException thrown if layer is null * @throws IllegalArgumentException thrown if targetNode is null - * + * */ public static Command mergeNodes(OsmDataLayer layer, Collection nodes, Node targetNode) throws IllegalArgumentException{ @@ -115,8 +115,8 @@ /** * Fixes the parent ways referring to one of the nodes. - * + * * Replies null, if the ways could not be fixed, i.e. because a way would have to be deleted * which is referred to by a relation. - * + * * @param backreferences the backreference data set * @param nodesToDelete the collection of nodes to be deleted Index: trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/MergeSelectionAction.java (revision 2512) @@ -40,5 +40,4 @@ } - public void actionPerformed(ActionEvent e) { if (getEditLayer() == null || getEditLayer().data.getSelected().isEmpty()) Index: trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java (revision 2512) @@ -38,5 +38,5 @@ Shortcut.registerShortcut("system:open", tr("File: {0}", tr("Open...")), KeyEvent.VK_O, Shortcut.GROUP_MENU)); putValue("help", ht("/Action/OpenFile")); - + } Index: trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java (revision 2512) @@ -44,5 +44,5 @@ /** * Restore the current history from the preferences - * + * * @param cbHistory */ Index: trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java (revision 2512) @@ -171,5 +171,5 @@ else { JOptionPane.showMessageDialog( - Main.parent, + Main.parent, "

"+tr(ex.getMessage())+"

"+tr("Usage")+tr(USAGE), tr("Selected Elements cannot be orthogonalized"), @@ -196,9 +196,9 @@ * the mean value of their y-Coordinates. * - The same for vertical segments. - * 5. Rotate back. + * 5. Rotate back. * **/ - private static void orthogonalize(ArrayList wayDataList, ArrayList headingNodes) - throws InvalidUserInputException + private static void orthogonalize(ArrayList wayDataList, ArrayList headingNodes) + throws InvalidUserInputException { // find average heading @@ -269,6 +269,6 @@ final HashSet s = new HashSet(allNodes); int s_size = s.size(); - for (int dummy = 0; dummy < s_size; ++ dummy) { - if (s.isEmpty()) break; + for (int dummy = 0; dummy < s_size; ++ dummy) { + if (s.isEmpty()) break; final Node dummy_n = s.iterator().next(); // pick arbitrary element of s @@ -333,9 +333,9 @@ if (headingNodes.contains(n)) { // The heading nodes should not have changed final double EPSILON = 1E-6; - if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) || + if (Math.abs(dx) > Math.abs(EPSILON * tmp.east()) || Math.abs(dy) > Math.abs(EPSILON * tmp.east())) { throw new AssertionError(); } - } + } else { OrthogonalizeAction.rememberMovements.put(n, new EastNorth(dx, dy)); @@ -346,5 +346,4 @@ Main.map.repaint(); } - /** @@ -510,5 +509,5 @@ * Exception: unsuited user input */ - private static class InvalidUserInputException extends Exception { + private static class InvalidUserInputException extends Exception { InvalidUserInputException(String message) { super(message); Index: trunk/src/org/openstreetmap/josm/actions/PasteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/PasteAction.java (revision 2512) @@ -70,6 +70,4 @@ double offsetNorth = mPosition.north() - (maxNorth + minNorth)/2.0; - - // Make a copy of pasteBuffer and map from old id to copied data id List bufferCopy = new ArrayList(); Index: trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/PasteTagsAction.java (revision 2512) @@ -254,5 +254,4 @@ } - public void actionPerformed(ActionEvent e) { if (getCurrentDataSet().getSelected().isEmpty()) Index: trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/RenameLayerAction.java (revision 2512) @@ -38,5 +38,5 @@ this.file = file; this.layer = layer; - this.putValue("help", ht("/Action/RenameLayer")); + this.putValue("help", ht("/Action/RenameLayer")); } Index: trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/SaveActionBase.java (revision 2512) @@ -130,5 +130,4 @@ } - /** * Check the data set if it would be empty on save. It is empty, if it contains Index: trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/SelectAllAction.java (revision 2512) @@ -26,5 +26,5 @@ /** * Refreshes the enabled state - * + * */ @Override Index: trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java (revision 2512) @@ -339,5 +339,4 @@ } - /** * dupe a single node into as many nodes as there are ways using it, OR Index: trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/UnselectAllAction.java (revision 2512) @@ -37,5 +37,5 @@ KeyEvent.VK_ESCAPE, Shortcut.GROUP_DIRECT).getKeyStroke(), tr("Unselect All")); - + putValue("help", ht("/Action/UnselectAll")); } @@ -48,5 +48,5 @@ /** * Refreshes the enabled state - * + * */ @Override Index: trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java (revision 2512) @@ -148,5 +148,5 @@ /** - * + * * @param toUpdate a collection of primitives to update from the server */ @@ -209,5 +209,4 @@ } } - @Override Index: trunk/src/org/openstreetmap/josm/actions/UploadAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/UploadAction.java (revision 2512) @@ -50,5 +50,4 @@ import org.xml.sax.SAXException; - /** * Action that opens a connection to the osm server and uploads all changes. @@ -94,5 +93,5 @@ /** * Registers an upload hook. Adds the hook at the first position of the upload hooks. - * + * * @param hook the upload hook. Ignored if null. */ @@ -106,5 +105,5 @@ /** * Unregisters an upload hook. Removes the hook from the list of upload hooks. - * + * * @param hook the upload hook. Ignored if null. */ @@ -342,5 +341,4 @@ } - /** * Handles the case where deleting a node failed because it is still in use in @@ -466,5 +464,4 @@ } - /** * error handler for any exception thrown during upload @@ -574,5 +571,5 @@ /** - * + * * @param layer the OSM data layer for which data is uploaded * @param toUpload the collection of primitives to upload @@ -600,5 +597,5 @@ * Retries to recover the upload operation from an exception which was thrown because * an uploaded primitive was already deleted on the server. - * + * * @param e the exception throw by the API * @param monitor a progress monitor Index: trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java (revision 2512) @@ -142,8 +142,8 @@ * Uploads the primitives in toUpload to the server. Only * uploads primitives which are either new, modified or deleted. - * + * * Also checks whether toUpload has to be extended with * deleted parents in order to avoid precondition violations on the server. - * + * * @param layer the data layer from which we upload a subset of primitives * @param toUpload the primitives to upload. If null or empty returns immediatelly @@ -178,5 +178,5 @@ * new primitive has to be uploaded as well, even if it isn't included in the * list of candidate primitives. - * + * */ static class UploadHullBuilder implements Visitor { @@ -228,5 +228,5 @@ * Builds the "hull" of primitives to be uploaded given a base collection * of osm primitives. - * + * * @param base the base collection. Must not be null. * @return the "hull" @@ -252,5 +252,5 @@ /** - * + * * @param layer the data layer for which a collection of selected primitives is uploaded * @param toUpload the collection of primitives to upload @@ -291,5 +291,5 @@ * Replies the collection of deleted OSM primitives for which we have to check whether * there are dangling references on the server. - * + * * @return */ Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/AbstractDownloadTask.java (revision 2512) @@ -30,5 +30,4 @@ } - protected void rememberErrorMessage(String message) { errorMessages.add(message); @@ -39,5 +38,4 @@ } - public List getErrorObjects() { return errorMessages; Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java (revision 2512) @@ -29,5 +29,5 @@ return Main.worker.submit(downloadTask); } - + public Future loadUrl(boolean a,java.lang.String b, ProgressMonitor progressMonitor) { return null; @@ -40,5 +40,4 @@ } } - class DownloadTask extends PleaseWaitRunnable { @@ -87,5 +86,5 @@ private Layer findMergeLayer() { boolean merge = Main.pref.getBoolean("download.gps.mergeWithLocal", false); - if (!Main.isDisplayingMapView()) + if (!Main.isDisplayingMapView()) return null; Layer active = Main.map.mapView.getActiveLayer(); Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java (revision 2512) @@ -38,5 +38,5 @@ * a list in the end. * @author xeen - * + * */ public class DownloadOsmTaskList { @@ -101,5 +101,5 @@ * Replies the set of ids of all complete, non-new primitives (i.e. those with ! * primitive.incomplete) - * + * * @return the set of ids of all complete, non-new primitives */ @@ -127,5 +127,5 @@ * Updates the local state of a set of primitives (given by a set of primitive ids) with the * state currently held on the server. - * + * * @param potentiallyDeleted a set of ids to check update from the server */ @@ -149,5 +149,5 @@ * yes, retrieves the current state on the server and checks whether the primitives are indeed * deleted on the server. - * + * * @param potentiallyDeleted a set of primitives (given by their ids) */ @@ -196,5 +196,5 @@ /** * Replies the set of primitive ids which have been downloaded by this task list - * + * * @return the set of primitive ids which have been downloaded by this task list */ Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadTask.java (revision 2512) @@ -8,5 +8,4 @@ import org.openstreetmap.josm.gui.progress.ProgressMonitor; - public interface DownloadTask { /** @@ -16,13 +15,13 @@ * Set progressMonitor to {@see NullProgressMonitor#INSTANCE} if progress information is to * be discarded. - * + * * You can wait for the asynchronous download task to finish by synchronizing on the returned * {@see Future}, but make sure not to freeze up JOSM. Example: * 
      *    Future future = task.download(...);
-     *    // DON'T run this on the Swing EDT or JOSM will freeze 
-     *    future.get(); // waits for the dowload task to complete 
+     *    // DON'T run this on the Swing EDT or JOSM will freeze
+     *    future.get(); // waits for the dowload task to complete
      *
- * + * * The following example uses a pattern which is better suited if a task is launched from * the Swing EDT: @@ -40,8 +39,8 @@ * Main.worker.submit(runAfterTask); * - * + * * @param newLayer true, if the data is to be downloaded into a new layer. If false, the task * selects one of the existing layers as download layer, preferably the active layer. - * + * * @param downloadArea the area to download * @param progressMonitor the progressMonitor @@ -56,5 +55,5 @@ * Set progressMonitor to {@see NullProgressMonitor#INSTANCE} if progress information is to * be discarded. - + * @param newLayer newLayer true, if the data is to be downloaded into a new layer. If false, the task * selects one of the existing layers as download layer, preferably the active layer. @@ -62,5 +61,5 @@ * @param progressMonitor the progressMonitor * @return the future representing the asynchronous task - * + * * @see #download(boolean, Bounds, ProgressMonitor) */ @@ -69,5 +68,5 @@ /** * Replies the error objects of the task. Empty list, if no error messages are available. - * + * * Error objects are either {@see String}s with error messages or {@see Exception}s. * @@ -78,5 +77,5 @@ /** * Cancels the asynchronous download task. - * + * */ public void cancel(); Index: trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/downloadtasks/PostDownloadHandler.java (revision 2512) @@ -14,5 +14,4 @@ import org.openstreetmap.josm.gui.ExceptionDialogUtil; import org.openstreetmap.josm.tools.ExceptionUtil; - public class PostDownloadHandler implements Runnable { @@ -46,5 +45,4 @@ } } - /** @@ -59,5 +57,5 @@ this.futures.addAll(futures); } - + public void run() { // wait for all downloads task to finish (by waiting for the futures Index: trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java (revision 2512) @@ -124,5 +124,4 @@ } - @Override public void actionPerformed(ActionEvent e) { super.actionPerformed(e); @@ -165,5 +164,5 @@ * highlights. For now, only the cursor is enabled because highlighting * requires WaySegment to be highlightable. - * + * * Normally the mouse event also contains the modifiers. However, when the * mouse is not moved and only modifier keys are pressed, no mouse event @@ -171,5 +170,5 @@ * mouseevent. Instead we copy the previous event and only update the * modifiers. - * + * * @param MouseEvent * @parm int modifiers @@ -286,5 +285,5 @@ * Deletes the relation in the context of the given layer. Also notifies * {@see RelationDialogManager} and {@see OsmDataLayer#fireDataChange()} events. - * + * * @param layer the layer in whose context the relation is deleted. Must not be null. * @param toDelete the relation to be deleted. Must not be null. Index: trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java (revision 2512) @@ -274,5 +274,4 @@ } - @Override public void mouseMoved(MouseEvent e) { // Mac OSX simulates with ctrl + mouse 1 the second mouse button hence no dragging events get fired. Index: trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java (revision 2512) @@ -39,5 +39,4 @@ private final SelectionManager selectionManager; - /** * Construct a ZoomAction without a label. Index: trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java (revision 2512) @@ -35,5 +35,4 @@ public static final int DEFAULT_SEARCH_HISTORY_SIZE = 10; - public static enum SearchMode { @@ -331,5 +330,5 @@ /** * Refreshes the enabled state - * + * */ @Override Index: trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/upload/CyclicUploadDependencyException.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java (revision 2512) @@ -28,5 +28,5 @@ * relations are uploaded before parent relations. It also checks for cyclic * dependencies in the list of new relations. - * + * * */ @@ -38,5 +38,5 @@ /** * builds the panel which warns users about a cyclic dependency - * + * * @param dep the list of relations with a cyclic dependency * @return the panel @@ -68,5 +68,5 @@ /** * Warns the user if a cyclic dependency is detected - * + * * @param e the cyclic dependency exception */ Index: trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/upload/UploadHook.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/actions/upload/UploadParameterHook.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/command/Command.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/Command.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/Command.java (revision 2512) @@ -21,5 +21,4 @@ import org.openstreetmap.josm.gui.layer.Layer; import org.openstreetmap.josm.gui.layer.OsmDataLayer; - /** @@ -151,5 +150,3 @@ abstract public MutableTreeNode description(); - - } Index: trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/ConflictAddCommand.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/ConflictResolveCommand.java (revision 2512) @@ -14,5 +14,5 @@ * This is the common base class for {@see Command}s which manipulate {@see Conflict}s in * addition to {@see OsmPrimitive}s. - * + * * A ConflictResolverCommand can remember a collection of conflicts it resolves. Upon undoing * it reconstitutes them. @@ -37,5 +37,5 @@ /** * remembers a conflict in the internal list of remembered conflicts - * + * * @param c the remembered conflict */ @@ -49,5 +49,5 @@ * reconstitutes all remembered conflicts. Add the remembered conflicts to the * set of conflicts of the {@see OsmDataLayer} this command was applied to. - * + * */ protected void reconstituteConflicts() { Index: trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java (revision 2512) @@ -30,5 +30,5 @@ /** * constructor - * + * * @param my my node * @param their their node @@ -39,5 +39,4 @@ this.decision = decision; } - @Override Index: trunk/src/org/openstreetmap/josm/command/DeleteCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/DeleteCommand.java (revision 2512) @@ -50,5 +50,5 @@ /** * Constructor. Deletes a collection of primitives in the current edit layer. - * + * * @param data the primitives to delete. Must neither be null nor empty. * @throws IllegalArgumentException thrown if data is null or empty @@ -64,5 +64,5 @@ /** * Constructor. Deletes a single primitive in the current edit layer. - * + * * @param data the primitive to delete. Must not be null. * @throws IllegalArgumentException thrown if data is null Index: trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java (revision 2512) @@ -30,5 +30,5 @@ /** * constructor - * + * * @param my my node * @param their their node @@ -39,5 +39,4 @@ this.decision = decision; } - @Override Index: trunk/src/org/openstreetmap/josm/command/MoveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/MoveCommand.java (revision 2512) @@ -54,5 +54,4 @@ */ private List oldState = new LinkedList(); - public MoveCommand(OsmPrimitive osm, double x, double y) { Index: trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java (revision 2512) @@ -65,5 +65,5 @@ * constructor * @param primitive the primitive to purge - * + * */ public PurgePrimitivesCommand(OsmPrimitive primitive) { @@ -75,5 +75,5 @@ * @param layer the OSM data layer * @param primitive the primitive to purge - * + * */ public PurgePrimitivesCommand(OsmDataLayer layer, OsmPrimitive primitive) { @@ -86,5 +86,5 @@ * @param layer the OSM data layer * @param primitives the primitives to purge - * + * */ public PurgePrimitivesCommand(OsmDataLayer layer, Collection primitives) { @@ -95,5 +95,5 @@ /** * Replies a collection with the purged primitives - * + * * @return a collection with the purged primitives */ @@ -235,5 +235,5 @@ * Use to inject a backreference data set used when the command * is executed. - * + * * @param ds the backreference data set */ Index: trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java (revision 2512) @@ -50,5 +50,4 @@ this.mergedMembers = mergedMembers; } - @Override Index: trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/TagConflictResolveCommand.java (revision 2512) @@ -27,5 +27,4 @@ private static final Logger logger = Logger.getLogger(TagConflictResolveCommand.class.getName()); - /** the conflict to resolve */ private Conflict conflict; @@ -34,8 +33,7 @@ private final List mergeItems; - /** * replies the number of decided conflicts - * + * * @return the number of decided conflicts */ @@ -52,5 +50,5 @@ /** * constructor - * + * * @param my my primitive * @param their their primitive @@ -61,5 +59,4 @@ this.mergeItems = mergeItems; } - @Override Index: trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java (revision 2512) @@ -55,5 +55,4 @@ } - @Override public MutableTreeNode description() { Index: trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java =================================================================== --- trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java (revision 2512) @@ -35,5 +35,4 @@ private final List mergedNodeList; - /** * @@ -46,5 +45,4 @@ this.mergedNodeList = mergedNodeList; } - @Override Index: trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/corrector/CorrectionTable.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java =================================================================== --- trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/data/APIDataSet.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/APIDataSet.java (revision 2512) @@ -27,5 +27,5 @@ * API. * The collection is derived from the modified primitives of an {@see DataSet}. - * + * */ public class APIDataSet { @@ -45,5 +45,5 @@ /** * initializes the API data set with the modified primitives in ds - * + * * @param ds the data set. Ignored, if null. */ @@ -73,5 +73,5 @@ * Ensures that primitives are deleted in the following order: Relations, then Ways, * then Nodes. - * + * */ protected void sortDeleted() { @@ -103,5 +103,5 @@ * Ensures that primitives are added in the following order: Nodes, then Ways, * then Relations. - * + * */ protected void sortNew() { @@ -131,5 +131,5 @@ /** * initializes the API data set with the modified primitives in ds - * + * * @param ds the data set. Ignored, if null. */ @@ -141,5 +141,5 @@ /** * initializes the API data set with the primitives in primitives - * + * * @param primitives the collection of primitives */ @@ -164,5 +164,5 @@ /** * Replies true if there are no primitives to upload - * + * * @return true if there are no primitives to upload */ @@ -173,5 +173,5 @@ /** * Replies the primitives which should be added to the OSM database - * + * * @return the primitives which should be added to the OSM database */ @@ -182,5 +182,5 @@ /** * Replies the primitives which should be updated in the OSM database - * + * * @return the primitives which should be updated in the OSM database */ @@ -191,5 +191,5 @@ /** * Replies the primitives which should be deleted in the OSM database - * + * * @return the primitives which should be deleted in the OSM database */ @@ -200,5 +200,5 @@ /** * Replies all primitives - * + * * @return all primitives */ @@ -214,8 +214,8 @@ * Adjusts the upload order for new relations. Child relations are uploaded first, * parent relations second. - * + * * This method detects cyclic dependencies in new relation. Relations with cyclic * dependencies can't be uploaded. - * + * * @throws CyclicUploadDependencyException thrown, if a cyclic dependency is detected */ @@ -238,5 +238,5 @@ * Replies the subset of relations in relations which are not referring to any * new relation - * + * * @param relations a list of relations * @return the subset of relations in relations which are not referring to any @@ -263,5 +263,5 @@ * Utility class to sort a collection of of new relations with their dependencies * topologically. - * + * */ private class RelationUploadDependencyGraph { Index: trunk/src/org/openstreetmap/josm/data/Bounds.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/Bounds.java (revision 2512) @@ -87,5 +87,5 @@ * new bounds shall have an extension in latitude direction of latExtent, * and in longitude direction of lonExtent. - * + * * @param center the center coordinate pair. Must not be null. * @param latExtent the latitude extent. > 0 required. Index: trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 2512) @@ -376,5 +376,4 @@ } - public void load() throws IOException { properties.clear(); Index: trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/ServerSidePreferences.java (revision 2512) @@ -201,9 +201,9 @@ for (int i = 0; i < 4; ++i) { String token = st.nextToken(); - try { + try { values[i] = Double.parseDouble(token); } catch(NumberFormatException e) { System.err.println(tr("Error: Illegal double value ''{0}'' on line ''{1}'' in bookmark list from server",token,line)); - continue; + continue; } } Index: trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/UndoRedoHandler.java (revision 2512) @@ -27,9 +27,7 @@ public final LinkedList listenerCommands = new LinkedList(); - public UndoRedoHandler() { Layer.listeners.add(this); } - /** Index: trunk/src/org/openstreetmap/josm/data/Version.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/Version.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/Version.java (revision 2512) Index: trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/conflict/Conflict.java (revision 2512) @@ -14,5 +14,5 @@ * {@see OsmPrimitive} from the dataset in another layer or the one retrieved from the server. * - * + * * */ Index: trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 2511) +++ trunk/src/org/openstreetmap/josm/data/conflict/ConflictCollection.java (revision 2512) @@ -19,5 +19,5 @@ * 
  *    ConflictCollection conflictCollection = ....
- * 
+ *
  *    for(Conflict c : conflictCollection) {
  *      // do something
@@ -68,5 +68,5 @@
     /**
      * Adds a conflict to the collection
-     * 
+     *
      * @param conflict the conflict
      * @exception IllegalStateException thrown, if this collection already includes a
@@ -83,9 +83,9 @@
     /**
      * Adds a conflict to the collection of conflicts.
-     * 
+     *
      * @param conflict the conflict to to add. Must not be null.
      * @throws IllegalArgumentException thrown, if conflict is null
      * @throws IllegalStateException thrown if this collection already includes a conflict for conflict.getMy()
-     * 
+     *
      */
     public void add(Conflict conflict) throws IllegalStateException, IllegalArgumentException {
@@ -98,5 +98,5 @@
     /**
      * Add the conflicts in otherConflicts to this collection of conflicts
-     * 
+     *
      * @param otherConflicts the collection of conflicts. Does nothing is conflicts is null.
      */
@@ -112,5 +112,5 @@
      * Adds a conflict for the pair of {@see OsmPrimitive}s given by my and
      * their.
-     * 
+     *
      * @param my  my primitive
      * @param their their primitive
@@ -123,5 +123,5 @@
     /**
      * removes a conflict from this collection
-     * 
+     *
      * @param conflict the conflict
      */
@@ -133,5 +133,5 @@
     /**
      * removes the conflict registered for {@see OsmPrimitive} my if any
-     * 
+     *
      * @param my  the primitive
      */
@@ -149,5 +149,5 @@
      * Replies the conflict for the {@see OsmPrimitive} my, null
      * if no such conflict exists.
-     * 
+     *
      * @param my  my primitive
      * @return the conflict for the {@see OsmPrimitive} my, null
@@ -164,5 +164,5 @@
      * Replies the conflict for the {@see OsmPrimitive} their, null
      * if no such conflict exists.
-     * 
+     *
      * @param my  my primitive
      * @return the conflict for the {@see OsmPrimitive} their, null
@@ -179,5 +179,5 @@
     /**
      * Replies true, if this collection includes a conflict for my.
-     * 
+     *
      * @param my my primitive
      * @return true, if this collection includes a conflict for my; false, otherwise
@@ -189,5 +189,5 @@
     /**
      * Replies true, if this collection includes a given conflict
-     * 
+     *
      * @param c the conflict
      * @return true, if this collection includes the conflict; false, otherwise
@@ -199,5 +199,5 @@
     /**
      * Replies true, if this collection includes a conflict for their.
-     * 
+     *
      * @param their their primitive
      * @return true, if this collection includes a conflict for their; false, otherwise
@@ -209,5 +209,5 @@
     /**
      * Removes any conflicts for the {@see OsmPrimitive} my.
-     * 
+     *
      * @param my the primitive
      */
@@ -223,5 +223,5 @@
     /**
      * Removes any conflicts for the {@see OsmPrimitive} their.
-     * 
+     *
      * @param their the primitive
      */
@@ -237,5 +237,5 @@
     /**
      * Replies the conflicts as list.
-     * 
+     *
      * @return the list of conflicts
      */
@@ -246,5 +246,5 @@
     /**
      * Replies the size of the collection
-     * 
+     *
      * @return the size of the collection
      */
@@ -255,5 +255,5 @@
     /**
      * Replies the conflict at position idx
-     * 
+     *
      * @param idx  the index
      * @return the conflict at position idx
@@ -265,5 +265,5 @@
     /**
      * Replies the iterator for this collection.
-     * 
+     *
      * @return the iterator
      */
@@ -281,5 +281,5 @@
      * Replies the set of  {@see OsmPrimitive} which participate in the role
      * of "my" in the conflicts managed by this collection.
-     * 
+     *
      * @return the set of  {@see OsmPrimitive} which participate in the role
      * of "my" in the conflicts managed by this collection.
@@ -295,5 +295,5 @@
      * Replies the set of  {@see OsmPrimitive} which participate in the role
      * of "their" in the conflicts managed by this collection.
-     * 
+     *
      * @return the set of  {@see OsmPrimitive} which participate in the role
      * of "their" in the conflicts managed by this collection.
@@ -309,5 +309,5 @@
     /**
      * Replies true if this collection is empty
-     * 
+     *
      * @return true, if this collection is empty; false, otherwise
      */
Index: trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/conflict/IConflictListener.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/coor/CoordinateFormat.java	(revision 2512)
@@ -6,5 +6,5 @@
 /**
  * An enumeration  of coordinate formats
- * 
+ *
  */
 public enum CoordinateFormat {
@@ -27,5 +27,5 @@
     /**
      * Replies the display name of the format
-     * 
+     *
      * @return the display name
      */
@@ -43,5 +43,5 @@
     /**
      * Replies the default coordinate format to be use
-     * 
+     *
      * @return the default coordinate format
      */
@@ -52,5 +52,5 @@
     /**
      * Sets the default coordinate format
-     * 
+     *
      * @param format the default coordinate format
      */
Index: trunk/src/org/openstreetmap/josm/data/coor/LatLon.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/coor/LatLon.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.data.coor;
-
 
 import static org.openstreetmap.josm.tools.I18n.tr;
@@ -27,5 +26,5 @@
     /**
      * Replies true if lat is in the range [-90,90]
-     * 
+     *
      * @param lat the latitude
      * @return true if lat is in the range [-90,90]
@@ -37,5 +36,5 @@
     /**
      * Replies true if lon is in the range [-180,180]
-     * 
+     *
      * @param lon the longitude
      * @return true if lon is in the range [-180,180]
Index: trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/coor/QuadTiling.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. Copyright 2009 by Dave Hansen, others
 package org.openstreetmap.josm.data.coor;
-
 
 public class QuadTiling
Index: trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/BackreferencedDataSet.java	(revision 2512)
@@ -87,5 +87,5 @@
      * Replies the set of parent primitives for a given child primitive. Replies
      * an empty set if no parents refer to the child.
-     * 
+     *
      * @param child the child primitive
      * @return  the set of parent primitives for a given child primitive.
@@ -109,5 +109,5 @@
      * Replies true if there is at least one parent referring to child;
      * false otherwise
-     * 
+     *
      * @param child the child primitive
      * @return true if there is at least one parent referring to child;
@@ -119,5 +119,5 @@
     /**
      * Replies a set of all {@see RelationToChildReference}s for a given child primitive.
-     * 
+     *
      * @param child the child primitive
      * @return  a set of all {@see RelationToChildReference}s for a given child primitive
@@ -138,5 +138,5 @@
     /**
      * Replies a set of all {@see RelationToChildReference}s for a collection of child primitives
-     * 
+     *
      * @param children the collection of child primitives
      * @return  a set of all {@see RelationToChildReference}s to the children in the collection of child
Index: trunk/src/org/openstreetmap/josm/data/osm/Changeset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Changeset.java	(revision 2512)
@@ -39,5 +39,4 @@
     private boolean incomplete;
 
-
     /**
      * Creates a new changeset with id 0.
@@ -197,5 +196,4 @@
     }
 
-
     public boolean hasEqualSemanticAttributes(Changeset other) {
         if (other == null)
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSet.java	(revision 2512)
@@ -57,5 +57,5 @@
     /**
      * Replies the API version this dataset was created from. May be null.
-     * 
+     *
      * @return the API version this dataset was created from. May be null.
      */
@@ -66,5 +66,5 @@
     /**
      * Sets the API version this dataset was created from.
-     * 
+     *
      * @param version the API version, i.e. "0.5" or "0.6"
      */
@@ -81,5 +81,5 @@
     /**
      * Replies an unmodifiable collection of nodes in this dataset
-     * 
+     *
      * @return an unmodifiable collection of nodes in this dataset
      */
@@ -101,5 +101,5 @@
     /**
      * Replies an unmodifiable collection of ways in this dataset
-     * 
+     *
      * @return an unmodifiable collection of ways in this dataset
      */
@@ -119,5 +119,5 @@
     /**
      * Replies an unmodifiable collection of relations in this dataset
-     * 
+     *
      * @return an unmodifiable collection of relations in this dataset
      */
@@ -239,5 +239,4 @@
     }
 
-
     /*---------------------------------------------------
      *   SELECTION HANDLING
@@ -254,5 +253,5 @@
      * notifies all registered selection change listeners about the current selection of
      * primitives
-     * 
+     *
      * @param sel the current selection
      */
@@ -266,10 +265,9 @@
      * Notifies all registered {@see SelectionChangedListener} about the current selection in
      * this dataset.
-     * 
+     *
      */
     public void fireSelectionChanged(){
         notifySelectionChangeListeners(selectedPrimitives);
     }
-
 
     LinkedHashSet selectedPrimitives = new LinkedHashSet();
@@ -285,5 +283,4 @@
         return sel;
     }
-
 
     /**
@@ -339,5 +336,4 @@
     }
 
-
     public void toggleSelected(Collection osm) {
         boolean changed = false;
@@ -457,5 +453,4 @@
     }
 
-
     /*------------------------------------------------------
      * FILTERED / DISABLED HANDLING
@@ -508,5 +503,4 @@
     }
 
-
     /**
      * Remove the filtered parameter from every value in the collection.
@@ -531,5 +525,4 @@
         }
     }
-
 
     @Override public DataSet clone() {
@@ -789,5 +782,4 @@
     }
 
-
     public void addDataSetListener(DataSetListener dsl) {
         listeners.add(dsl);
@@ -913,5 +905,5 @@
      * Removes all primitives from the dataset and resets the currently selected primitives
      * to the empty collection. Also notifies selection change listeners if necessary.
-     * 
+     *
      */
     public void clear() {
@@ -926,5 +918,4 @@
     }
 
-
     // TODO Should be completely part of validator
     private Map> errors = new HashMap>();
@@ -941,5 +932,5 @@
     /**
      * Replies the list of errors registered for this primitive.
-     * 
+     *
      * @param primitive the primitive for which errors are queried
      * @return the list of errors. Never null.
Index: trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/DataSetMerger.java	(revision 2512)
@@ -17,5 +17,5 @@
  * A dataset merger which takes a target and a source dataset and merges the source data set
  * onto the target dataset.
- * 
+ *
  */
 public class DataSetMerger {
@@ -179,9 +179,9 @@
     /**
      * Merges the node list of a source way onto its target way.
-     * 
+     *
      * @param source the source way
      * @throws IllegalStateException thrown if no target way can be found for the source way
      * @throws IllegalStateException thrown if there isn't a target node for one of the nodes in the source way
-     * 
+     *
      */
     private void mergeNodeList(Way source) throws IllegalStateException {
@@ -204,5 +204,4 @@
         target.setNodes(newNodes);
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/osm/DateFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/DateFormatter.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/DateFormatter.java	(revision 2512)
@@ -5,5 +5,4 @@
 import java.util.GregorianCalendar;
 import java.util.TimeZone;
-
 
 /**
@@ -16,5 +15,4 @@
     private GregorianCalendar calendar;
 
-
     /**
      * Creates a new instance.
@@ -23,5 +21,4 @@
         calendar = new GregorianCalendar(TimeZone.getTimeZone("UTC"));
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/osm/Filter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Filter.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Filter.java	(revision 2512)
@@ -39,10 +39,10 @@
       applyForChildren = Boolean.parseBoolean(prfs[9]);
 
-   }  
+   }
 
    public String getPrefString(){
-      return version + ";" + 
+      return version + ";" +
           text + ";" + mode + ";" + caseSensitive + ";" + regexSearch + ";" +
-          "legacy" + ";" + enable + ";" + hide + ";" + 
+          "legacy" + ";" + enable + ";" + hide + ";" +
           inverted + ";" + applyForChildren;
    }
Index: trunk/src/org/openstreetmap/josm/data/osm/Hash.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Hash.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Hash.java	(revision 2512)
@@ -1,5 +1,5 @@
 /*
  *  JOSMng - a Java Open Street Map editor, the next generation.
- * 
+ *
  *  Copyright (C) 2008 Petr Nejedly 
  *
@@ -26,24 +26,24 @@
  * It supports two type parameters to implement effective foreign key implementation
  * inside (@link Storage}, but for basic use, both type parameters are the same.
- * 
+ *
  * For use cases, see {@link Storage}.
  * @author nenik
  */
 public interface Hash {
-    
+
     /**
      * Get hashcode for given instance, based on some inner state of the
      * instance. The returned hashcode should remain constant over the time,
      * so it should be based on some instance invariant.
-     * 
+     *
      * @param k the object to compute hashcode for
      * @return computed hashcode
      */
     public int getHashCode(K k);
-    
+
     /**
      * Compare two instances for semantic or lookup equality. For use cases
      * where it compares different types, refer to {@link Storage}.
-     * 
+     *
      * @param k the object to compare
      * @param t the object to compare
Index: trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/NameFormatter.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/osm/Node.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Node.java	(revision 2512)
@@ -51,9 +51,7 @@
     }
 
-
     protected Node(long id, boolean allowNegative) {
         super(id, allowNegative);
     }
-
 
     /**
@@ -65,5 +63,4 @@
     }
 
-
     /**
      * Create an incomplete Node object
@@ -74,5 +71,5 @@
 
     /**
-     * 
+     *
      * @param clone
      * @param clearId If true, set version to 0 and id to new unique value
@@ -114,8 +111,8 @@
     /**
      * Merges the technical and semantical attributes from other onto this.
-     * 
+     *
      * Both this and other must be new, or both must be assigned an OSM ID. If both this and other
      * have an assigend OSM id, the IDs have to be the same.
-     * 
+     *
      * @param other the other primitive. Must not be null.
      * @throws IllegalArgumentException thrown if other is null.
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java	(revision 2512)
@@ -23,5 +23,4 @@
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
 import org.openstreetmap.josm.gui.mappaint.ElemStyle;
-
 
 /**
@@ -97,5 +96,4 @@
     }
 
-
     private static final int FLAG_MODIFIED = 1 << 0;
     private static final int FLAG_VISIBLE  = 1 << 1;
@@ -150,5 +148,4 @@
         return ret;
     }
-
 
     /* mappaint data */
@@ -496,5 +493,4 @@
         return uninteresting;
     }
-
 
     private static Collection directionKeys = null;
@@ -772,5 +768,5 @@
     /**
      * Replies true if this primitive has a tag with key key
-     * 
+     *
      * @param key the key
      * @return true, if his primitive has a tag with key key
@@ -787,5 +783,5 @@
     /**
      * Replies true if other isn't null and has the same tags (key/value-pairs) as this.
-     * 
+     *
      * @param other the other object primitive
      * @return true if other isn't null and has the same tags (key/value-pairs) as this.
@@ -800,5 +796,4 @@
 
     private Object referrers;
-
 
     /**
@@ -895,5 +890,4 @@
         return result;
     }
-
 
     /**
@@ -1030,5 +1024,4 @@
     }
 
-
     /**
      * Replies the name of this primitive. The default implementation replies the value
@@ -1146,3 +1139,2 @@
     }
 }
-
Index: trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/PrimitiveData.java	(revision 2512)
@@ -148,5 +148,4 @@
     }
 
-
     @SuppressWarnings("unchecked")
     static public   List getFilteredList(Collection list, OsmPrimitiveType type) {
@@ -174,5 +173,3 @@
     }
 
-
-
 }
Index: trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/QuadBuckets.java	(revision 2512)
@@ -12,5 +12,4 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.coor.QuadTiling;
-
 
 public class QuadBuckets implements Collection
Index: trunk/src/org/openstreetmap/josm/data/osm/Relation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Relation.java	(revision 2512)
@@ -283,5 +283,4 @@
     }
 
-
     /**
      * removes all members with member.member == primitive
Index: trunk/src/org/openstreetmap/josm/data/osm/Storage.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Storage.java	(revision 2512)
@@ -144,7 +144,7 @@
 
     public @Override int hashCode() {
-	int h = 0;
+        int h = 0;
         for (T t : this) h += hash.getHashCode(t);
-	return h;
+        return h;
     }
 
@@ -259,6 +259,4 @@
     }
 
-
-
     private void ensureSpace() {
         if (size > data.length*loadFactor) { // rehash
@@ -277,5 +275,4 @@
         }
     }
-
 
     // -------------- factories --------------------
Index: trunk/src/org/openstreetmap/josm/data/osm/Tag.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Tag.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Tag.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.data.osm;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/TagCollection.java	(revision 2512)
@@ -679,5 +679,4 @@
     }
 
-
     public TagCollection emptyTagsForKeysMissingIn(TagCollection other) {
         TagCollection ret = new TagCollection();
Index: trunk/src/org/openstreetmap/josm/data/osm/Tagged.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Tagged.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Tagged.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/osm/User.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/User.java	(revision 2512)
@@ -27,5 +27,4 @@
     private static HashMap userMap = new HashMap();
 
-
     private static long getNextLocalUid() {
         synchronized(User.class) {
@@ -36,5 +35,5 @@
     /**
      * Creates a local user with the given name
-     * 
+     *
      * @param name the name
      */
@@ -47,5 +46,5 @@
     /**
      * Creates a user known to the OSM server
-     * 
+     *
      * @param uid  the user id
      * @param name the name
@@ -64,5 +63,5 @@
     /**
      * clears the static map of user ids to user objects
-     * 
+     *
      */
     public static void clearUserMap() {
@@ -72,5 +71,5 @@
     /**
      * Returns the user with user id uid or null if this user doesn't exist
-     * 
+     *
      * @param uid the user id
      * @return the user; null, if there is no user with  this id
@@ -83,5 +82,5 @@
      * Returns the list of users with name name or the empty list if
      * no such users exist
-     * 
+     *
      * @param name the user name
      * @return the list of users with name name or the empty list if
@@ -108,5 +107,5 @@
     /**
      * Replies the user name
-     * 
+     *
      * @return the user name. Never null, but may be the empty string
      */
@@ -118,9 +117,9 @@
      * Replies the user id. If this user is known to the OSM server the positive user id
      * from the server is replied. Otherwise, a negative local value is replied.
-     * 
+     *
      * A negative local is only unique during an editing session. It is lost when the
      * application is closed and there is no guarantee that a negative local user id is
      * always bound to a user with the same name.
-     * 
+     *
      */
     public long getId() {
Index: trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/UserInfo.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/osm/Way.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/Way.java	(revision 2512)
@@ -133,5 +133,4 @@
     }
 
-
     @Override public void visit(Visitor visitor) {
         visitor.visit(this);
@@ -151,5 +150,5 @@
 
     /**
-     * 
+     *
      * @param original
      * @param clearId
@@ -327,5 +326,4 @@
     }
 
-
     public boolean isClosed() {
         if (incomplete) return false;
Index: trunk/src/org/openstreetmap/josm/data/osm/history/History.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/History.java	(revision 2512)
@@ -17,5 +17,5 @@
  * Represents the history of an OSM primitive. The history consists
  * of a list of object snapshots with a specific version.
- * 
+ *
  */
 public class History{
@@ -42,5 +42,5 @@
     /**
      * Creates a new history for an OSM primitive
-     * 
+     *
      * @param id the id. >0 required.
      * @param type the primitive type. Must not be null.
@@ -48,5 +48,5 @@
      * @throws IllegalArgumentException thrown if id <= 0
      * @throws IllegalArgumentException if type is null
-     * 
+     *
      */
     protected History(long id, OsmPrimitiveType type, List versions) {
@@ -169,5 +169,5 @@
     /**
      * Replies the primitive id for this history.
-     * 
+     *
      * @return the primitive id
      */
@@ -187,5 +187,5 @@
      * Replies the history primitive with version version. null,
      * if no such primitive exists.
-     * 
+     *
      * @param version the version
      * @return the history primitive with version version
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java	(revision 2512)
@@ -15,5 +15,5 @@
 /**
  * A data set holding histories of OSM primitives.
- * 
+ *
  *
  */
@@ -26,5 +26,5 @@
     /**
      * Replies the unique instance of the history data set
-     * 
+     *
      * @return the unique instance of the history data set
      */
@@ -70,5 +70,5 @@
      * Replies the history primitive for the primitive with id id
      * and version version. null, if no such primitive exists.
-     * 
+     *
      * @param id the id of the primitive. > 0 required.
      * @param type the primitive type. Must not be null.
@@ -98,5 +98,5 @@
     /**
      * Adds a history primitive to the data set
-     * 
+     *
      * @param primitive  the history primitive to add
      */
@@ -113,5 +113,5 @@
      * Replies the history for a given primitive with id id
      * and type type.
-     * 
+     *
      * @param id the id the if of the primitive. > 0 required
      * @param type the type of the primitive. Must not be null.
@@ -133,5 +133,5 @@
      * Replies the history for a primitive with id id. null, if no
      * such history exists.
-     * 
+     *
      * @param pid the primitive id. Must not be null.
      * @return the history for a primitive with id id. null, if no
@@ -150,5 +150,5 @@
     /**
      * merges the histories from the {@see HistoryDataSet} other in this history data set
-     * 
+     *
      * @param other the other history data set. Ignored if null.
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryDataSetListener.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryNode.java	(revision 2512)
@@ -6,5 +6,4 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.OsmPrimitiveType;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java	(revision 2512)
@@ -135,5 +135,5 @@
      * Sets the tags for this history primitive. Removes all
      * tags if tags is null.
-     * 
+     *
      * @param tags the tags. May be null.
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java	(revision 2512)
@@ -22,5 +22,5 @@
     /**
      * constructor
-     * 
+     *
      * @param id the id (>0 required)
      * @param version the version (> 0 required)
@@ -30,5 +30,5 @@
      * @param changesetId the changeset id (> 0 required)
      * @param timestamp the timestamp (! null required)
-     * 
+     *
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
@@ -40,5 +40,5 @@
     /**
      * constructor
-     * 
+     *
      * @param id the id (>0 required)
      * @param version the version (> 0 required)
@@ -49,5 +49,5 @@
      * @param timestamp the timestamp (! null required)
      * @param members list of members for this relation
-     * 
+     *
      * @throws IllegalArgumentException thrown if preconditions are violated
      */
@@ -62,5 +62,5 @@
     /**
      * replies an immutable list of members of this relation
-     * 
+     *
      * @return an immutable list of members of this relation
      */
@@ -71,7 +71,7 @@
     /**
      * replies the number of members
-     * 
+     *
      * @return the number of members
-     * 
+     *
      */
     public int getNumMembers() {
@@ -93,5 +93,5 @@
     /**
      * replies the type, i.e. {@see OsmPrimitiveType#RELATION}
-     * 
+     *
      */
     @Override
@@ -102,5 +102,5 @@
     /**
      * adds a member to the list of members
-     * 
+     *
      * @param member the member (must not be null)
      * @exception IllegalArgumentException thrown, if member is null
Index: trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java	(revision 2512)
@@ -39,5 +39,5 @@
     /**
      * replies the idx-th node id in the list of node ids of this way
-     * 
+     *
      * @param idx the index
      * @return the idx-th node id
@@ -52,5 +52,5 @@
     /**
      * replies an immutable list of the ways node ids
-     * 
+     *
      * @return the ways node ids
      */
@@ -61,5 +61,5 @@
     /**
      * replies the ways type, i.e. {@see OsmPrimitiveType#WAY}
-     * 
+     *
      * @return the ways type
      */
@@ -71,5 +71,5 @@
     /**
      * adds a node id to the list nodes of this way
-     * 
+     *
      * @param ref the node id to add
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/history/RelationMember.java	(revision 2512)
@@ -18,9 +18,9 @@
 
     /**
-     * 
+     *
      * @param role  the role
      * @param primitiveType  the type (must not be null)
      * @param primitiveId the id (>0 required)
-     * 
+     *
      * @exception IllegalArgumentException thrown, if primitiveType is null
      * @exception IllegalArgumentException thrown, if primitiveId <= 0
@@ -46,5 +46,5 @@
     /**
      * replies the type of the referenced OSM primitive
-     * 
+     *
      * @return the type of the referenced OSM primitive
      */
@@ -55,5 +55,5 @@
     /**
      * replies the id of the referenced OSM primitive
-     * 
+     *
      * @return the id of the referenced OSM primitive
      */
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/CollectBackReferencesVisitor.java	(revision 2512)
@@ -24,5 +24,4 @@
     private Collection data = new HashSet();
 
-
     /**
      * @param ds This parameter is ignored
@@ -43,5 +42,4 @@
         this.indirectRefs = indirectRefs;
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 2512)
@@ -1171,7 +1171,7 @@
                 // g.setColor(new Color(255,255,0,128));
                 // g.drawRect((int)centeredNBounds.getMinX(),
-                //	   (int)centeredNBounds.getMinY(),
-                //	   (int)centeredNBounds.getWidth(),
-                //	   (int)centeredNBounds.getHeight());
+                //     (int)centeredNBounds.getMinY(),
+                //     (int)centeredNBounds.getWidth(),
+                //     (int)centeredNBounds.getHeight());
 
                 if ((pb.width >= nb.getWidth() && pb.height >= nb.getHeight()) && // quick check
@@ -1619,5 +1619,4 @@
         }
 
-
         //if(profiler)
         //{
Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MergeSourceBuildingVisitor.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/data/projection/NTV2Util.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/NTV2Util.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/projection/NTV2Util.java	(revision 2512)
@@ -81,5 +81,4 @@
     }
 
-
     /**
      * Get a double from the first 8 bytes of a byte array,
Index: trunk/src/org/openstreetmap/josm/data/projection/Puwg.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/Puwg.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/projection/Puwg.java	(revision 2512)
@@ -121,5 +121,5 @@
     {
         zone = DEFAULT_ZONE;
-        if(!args != null)
+        if(args != null)
         {
             try {
Index: trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/data/projection/SwissGrid.java	(revision 2512)
@@ -33,5 +33,4 @@
             double phiprime_2 = Math.pow(phiprime,2);
 
-
             double north =
                   200147.07d
@@ -41,5 +40,4 @@
                 -    194.56d    * lambdaprime_2        * phiprime
                 +    119.79d                           * Math.pow(phiprime,3);
-
 
             double east =
Index: trunk/src/org/openstreetmap/josm/gui/BookmarkList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/BookmarkList.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/BookmarkList.java	(revision 2512)
@@ -82,9 +82,9 @@
         }
     }
-    
+
     class BookmarkCellRenderer extends JLabel implements ListCellRenderer {
 
         private ImageIcon icon;
-        
+
         public BookmarkCellRenderer() {
             setOpaque(true);
@@ -92,5 +92,5 @@
             setIcon(icon);
         }
-        
+
         protected void renderColor(boolean selected) {
             if (selected) {
@@ -102,5 +102,5 @@
             }
         }
-        
+
         protected String buildToolTipText(Bookmark b) {
             Bounds area = b.getArea();
@@ -113,9 +113,9 @@
             .append("");
             return sb.toString();
-            
+
         }
         public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected,
                 boolean cellHasFocus) {
-            
+
             Bookmark b = (Bookmark) value;
             renderColor(isSelected);
@@ -123,5 +123,5 @@
             setToolTipText(buildToolTipText(b));
             return this;
-        }        
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/ConditionalOptionPaneUtil.java	(revision 2512)
@@ -16,14 +16,13 @@
 import org.openstreetmap.josm.tools.GBC;
 
-
 /**
  * ConditionalOptionPaneUtil provides static utility methods for displaying modal message dialogs
  * which can be enabled/disabled by the user.
- * 
+ *
  * They wrap the methods provided by {@see JOptionPane}. Within JOSM you should use these
  * methods rather than the bare methods from {@see JOptionPane} because the methods provided
  * by ConditionalOptionPaneUtil ensure that a dialog window is always on top and isn't hidden by one of the
  * JOSM windows for detached dialogs, relation editors, history browser and the like.
- * 
+ *
  */
 public class ConditionalOptionPaneUtil {
@@ -38,5 +37,5 @@
      * Replies the preference value for the preference key "message." + prefKey.
      * The default value if the preference key is missing is true.
-     * 
+     *
      * @param  the preference key
      * @return prefKey the preference value for the preference key "message." + prefKey
@@ -48,5 +47,5 @@
     /**
      * sets the value for the preference key "message." + prefKey.
-     * 
+     *
      * @param prefKey the key
      * @param enabled the value
@@ -60,5 +59,5 @@
      * It is always on top even if there are other open windows like detached dialogs,
      * relation editors, history browsers and the like.
-     * 
+     *
      * Set optionType to {@see JOptionPane#YES_NO_OPTION} for a dialog with a YES and
      * a NO button.
@@ -66,9 +65,9 @@
      * Set optionType to {@see JOptionPane#YES_NO_CANCEL_OPTION} for a dialog with a YES,
      * a NO and a CANCEL button
-     * 
+     *
      * Replies true, if the selected option is equal to trueOption, otherwise false.
      * Replies true, if the dialog is not displayed because the respective preference option
      * preferenceKey is set to false.
-     * 
+     *
      * @param preferenceKey the preference key
      * @param parent  the parent component
@@ -79,9 +78,9 @@
      * @param options a list of options
      * @param defaultOption the default option
-     * 
-     * 
+     *
+     *
      * @return the index of the selected option. {@see JOptionPane#CLOSED_OPTION} if the dialog was closed.
      * {@see ConditionalOptionPaneUtil#DIALOG_DISABLED_OPTION} if the dialog is disabled.
-     * 
+     *
      */
     static public int showOptionDialog(String preferenceKey, Component parent, Object message, String title, int optionType, int messageType, Object [] options, Object defaultOption) throws HeadlessException {
@@ -98,5 +97,5 @@
      * It is always on top even if there are other open windows like detached dialogs,
      * relation editors, history browsers and the like.
-     * 
+     *
      * Set optionType to {@see JOptionPane#YES_NO_OPTION} for a dialog with a YES and
      * a NO button.
@@ -104,9 +103,9 @@
      * Set optionType to {@see JOptionPane#YES_NO_CANCEL_OPTION} for a dialog with a YES,
      * a NO and a CANCEL button
-     * 
+     *
      * Replies true, if the selected option is equal to trueOption, otherwise false.
      * Replies true, if the dialog is not displayed because the respective preference option
      * preferenceKey is set to false.
-     * 
+     *
      * @param preferenceKey the preference key
      * @param parent  the parent component
@@ -116,8 +115,8 @@
      * @param messageType the message type
      * @param trueOption  if this option is selected the method replies true
-     * 
-     * 
+     *
+     *
      * @return true, if the selected option is equal to trueOption, otherwise false.
-     * 
+     *
      * @see JOptionPane#INFORMATION_MESSAGE
      * @see JOptionPane#WARNING_MESSAGE
@@ -137,8 +136,8 @@
      * is always on top even if there are other open windows like detached dialogs,
      * relation editors, history browsers and the like.
-     * 
+     *
      * If there is a preference with key preferenceKey and value false
      * the dialog is not show.
-     * 
+     *
      * @param preferenceKey the preference key
      * @param parent  the parent component
@@ -146,5 +145,5 @@
      * @param title the title
      * @param messageType the message type
-     * 
+     *
      * @see JOptionPane#INFORMATION_MESSAGE
      * @see JOptionPane#WARNING_MESSAGE
Index: trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java	(revision 2512)
@@ -30,5 +30,5 @@
     /**
      * Replies the unique instance of this formatter
-     * 
+     *
      * @return the unique instance of this formatter
      */
@@ -52,5 +52,5 @@
      *   
  • by the default tags in {@see #DEFAULT_NAMING_TAGS_FOR_RELATIONS}
      * 
-     * 
+     *
      * @return the list of naming tags used in relations
      */
@@ -64,9 +64,8 @@
     }
 
-
     /**
      * Decorates the name of primitive with its id, if the preference
      * osm-primitives.showid is set.
-     * 
+     *
      * @param name  the name without the id
      * @param primitive the primitive
@@ -82,5 +81,5 @@
     /**
      * Formats a name for a node
-     * 
+     *
      * @param node the node
      * @return the name
@@ -107,5 +106,5 @@
     /**
      * Formats a name for a way
-     * 
+     *
      * @param way the way
      * @return the name
@@ -145,5 +144,5 @@
     /**
      * Formats a name for a relation
-     * 
+     *
      * @param relation the relation
      * @return the name
@@ -193,5 +192,5 @@
     /**
      * Formats a name for a changeset
-     * 
+     *
      * @param changeset the changeset
      * @return the name
Index: trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java	(revision 2512)
@@ -23,5 +23,5 @@
 /**
  * This utility class provides static methods which explain various exceptions to the user.
- * 
+ *
  */
 public class ExceptionDialogUtil {
@@ -80,5 +80,5 @@
     /**
      * Explains an exception with a generic message dialog
-     * 
+     *
      * @param e the exception
      */
@@ -98,5 +98,5 @@
      * This is most likely happening when user tries to access the OSM API from within an
      * applet which wasn't loaded from the API server.
-     * 
+     *
      * @param e the exception
      */
@@ -116,5 +116,5 @@
      * This is most likely because there's not connection to the Internet or because
      * the remote server is not reachable.
-     * 
+     *
      * @param e the exception
      */
@@ -134,5 +134,5 @@
      * This is most likely happening when the communication with the remote server is
      * interrupted for any reason.
-     * 
+     *
      * @param e the exception
      */
@@ -150,5 +150,5 @@
     /**
      * Explains a {@see InvocationTargetException }
-     * 
+     *
      * @param e the exception
      */
@@ -167,5 +167,5 @@
      * Explains a {@see OsmApiException} which was thrown because of an internal server
      * error in the OSM API server.
-     * 
+     *
      * @param e the exception
      */
@@ -184,5 +184,5 @@
      * Explains a {@see OsmApiException} which was thrown because of a bad
      * request
-     * 
+     *
      * @param e the exception
      */
@@ -200,5 +200,5 @@
      * Explains a {@see OsmApiException} which was thrown because a resource wasn't found
      * on the server
-     * 
+     *
      * @param e the exception
      */
@@ -215,5 +215,5 @@
     /**
      * Explains a {@see OsmApiException} which was thrown because of a conflict
-     * 
+     *
      * @param e the exception
      */
@@ -232,5 +232,5 @@
      * This is most likely happening when there is an error in the API URL or when
      * local DNS services are not working.
-     * 
+     *
      * @param e the exception
      */
@@ -249,5 +249,5 @@
      * Replies the first nested exception of type nestedClass (including
      * the root exception e) or null, if no such exception is found.
-     * 
+     *
      * @param 
      * @param e the root exception
@@ -270,5 +270,5 @@
     /**
      * Explains an {@see OsmTransferException} to the user.
-     * 
+     *
      * @param e the {@see OsmTransferException}
      */
@@ -350,5 +350,5 @@
     /**
      * Explains an {@see Exception} to the user.
-     * 
+     *
      * @param e the {@see Exception}
      */
Index: trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java	(revision 2512)
@@ -28,5 +28,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.WindowGeometry;
-
 
 public class ExtendedDialog extends JDialog {
@@ -73,9 +72,9 @@
      *   
  • setRememberWindowGeometry
    • 
      * 
-     * 
+     *
      * When done, call showDialog to display it. You can receive
      * the user's choice using getValue. Have a look at this function
      * for possible return values.
-     * 
+     *
      * @param parent       The parent element that will be used for position and maximum size
      * @param title        The text that will be shown in the window titlebar
@@ -110,5 +109,5 @@
      * Allows decorating the buttons with tooltips. Expects an String[] with translated
      * tooltip texts.
-     * 
+     *
      * @param toolTipTexts the tool tip texts. Ignored, if null.
      */
@@ -119,8 +118,8 @@
     /**
      * Sets the content that will be displayed in the message dialog.
-     * 
+     *
      * Note that depending on your other settings more UI elements may appear.
      * The content is played on top of the other elements though.
-     * 
+     *
      * @param content Any element that can be displayed in the message dialog
      */
@@ -131,11 +130,11 @@
     /**
      * Sets the content that will be displayed in the message dialog.
-     * 
+     *
      * Note that depending on your other settings more UI elements may appear.
      * The content is played on top of the other elements though.
-     * 
+     *
      * @param content Any element that can be displayed in the message dialog
      * @param placeContentInScrollPane if  true, places  the content in a JScrollPane
-     * 
+     *
      */
     public void setContent(Component content, boolean placeContentInScrollPane) {
@@ -147,8 +146,8 @@
      * Sets the message that will be displayed. The String will be automatically
      * wrapped if it is too long.
-     * 
+     *
      * Note that depending on your other settings more UI elements may appear.
      * The content is played on top of the other elements though.
-     * 
+     *
      * @param message The text that should be shown to the user
      */
@@ -333,13 +332,13 @@
      * Set the pref to null or to an empty string to disable again.
      * By default, it's disabled.
-     * 
+     *
      * Note: If you want to set the width of this dialog directly use the usual
      * setSize, setPreferredSize, setMaxSize, setMinSize
-     * 
+     *
      * @param pref  The preference to save the dimension to
      * @param wg    The default window geometry that should be used if no
      *              existing preference is found (only takes effect if
      *              pref is not null or empty
-     * 
+     *
      */
     public void setRememberWindowGeometry(String pref, WindowGeometry wg) {
@@ -426,5 +425,5 @@
      *  the button row)
      * 
-     * 
+     *
      * @param helpTopic the help topic
      * @param showHelpButton true, if the dialog displays a help button
@@ -434,5 +433,4 @@
         this.showHelpButton = showHelpButton;
     }
-
 
     class HelpAction extends AbstractAction {
Index: trunk/src/org/openstreetmap/josm/gui/FileDrop.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/FileDrop.java	(revision 2512)
@@ -63,5 +63,4 @@
     private transient java.awt.dnd.DropTargetListener dropListener;
 
-
     /** Discover if the running JVM is modern enough to have drag and drop. */
     private static Boolean supportsDnD;
@@ -69,5 +68,4 @@
     // Default border color
     private static java.awt.Color defaultBorderColor = new java.awt.Color( 0f, 0f, 1f, 0.25f );
-
 
     /* Constructor for JOSM file drop */
@@ -108,7 +106,4 @@
     }   // end constructor
 
-
-
-
     /**
      * Constructor with a default border and the option to recursively set drop targets.
@@ -132,5 +127,4 @@
     }   // end constructor
 
-
     /**
      * Constructor with a default border and debugging optionally turned on.
@@ -156,6 +150,4 @@
             listener );
     }   // end constructor
-
-
 
     /**
@@ -188,7 +180,4 @@
     }   // end constructor
 
-
-
-
     /**
      * Constructor with a specified border
@@ -210,7 +199,4 @@
             listener );
     }   // end constructor
-
-
-
 
     /**
@@ -238,6 +224,4 @@
     }   // end constructor
 
-
-
     /**
      * Constructor with a specified border and debugging optionally turned on.
@@ -265,8 +249,4 @@
             listener );
     }   // end constructor
-
-
-
-
 
     /**
@@ -446,5 +426,4 @@
     }   // end constructor
 
-
     private static boolean supportsDnD()
     {   // Static Boolean
@@ -464,5 +443,4 @@
     }   // end supportsDnD
 
-
     // BEGIN 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
     private static String ZERO_CHAR_STRING = "" + (char)0;
@@ -493,5 +471,4 @@
     }
     // END 2007-09-12 Nathan Blomquist -- Linux (KDE/Gnome) support added.
-
 
     private void makeDropTarget( final java.io.PrintStream out, final java.awt.Component c, boolean recursive )
@@ -541,6 +518,4 @@
     }   // end dropListener
 
-
-
     /** Determine if the dragged data is a file list. */
     private boolean isDragOk( final java.io.PrintStream out, final java.awt.dnd.DropTargetDragEvent evt )
@@ -578,5 +553,4 @@
     }   // end isDragOk
 
-
     /** Outputs message to out if it's not null. */
     private static void log( java.io.PrintStream out, String message )
@@ -587,7 +561,4 @@
     }   // end log
 
-
-
-
     /**
      * Removes the drag-and-drop hooks from the component and optionally
@@ -603,6 +574,4 @@
     {   return remove( null, c, true );
     }   // end remove
-
-
 
     /**
@@ -633,9 +602,5 @@
     }   // end remove
 
-
-
-
     /* ********  I N N E R   I N T E R F A C E   L I S T E N E R  ******** */
-
 
     /**
@@ -664,10 +629,7 @@
         public abstract void filesDropped( java.io.File[] files );
 
-
     }   // end inner-interface Listener
 
-
     /* ********  I N N E R   C L A S S  ******** */
-
 
     /**
@@ -678,5 +640,5 @@
      *
      * 
    I'm releasing this code into the Public Domain. Enjoy.
    
-     * 
+     *
      * @author  Robert Harder
      * @author  rob@iharder.net
@@ -714,8 +676,5 @@
     }   // end inner class Event
 
-
-
     /* ********  I N N E R   C L A S S  ******** */
-
 
     /**
@@ -756,5 +715,5 @@
      *
      * 
    I'm releasing this code into the Public Domain. Enjoy.
    
-     * 
+     *
      * @author  Robert Harder
      * @author  rob@iharder.net
@@ -770,5 +729,4 @@
          */
         public final static String MIME_TYPE = "application/x-net.iharder.dnd.TransferableObject";
-
 
         /**
@@ -784,11 +742,8 @@
             new java.awt.datatransfer.DataFlavor( FileDrop.TransferableObject.class, MIME_TYPE );
 
-
         private Fetcher fetcher;
         private Object data;
 
         private java.awt.datatransfer.DataFlavor customFlavor;
-
-
 
         /**
@@ -807,6 +762,4 @@
         }   // end constructor
 
-
-
         /**
          * Creates a new {@link TransferableObject} that will return the
@@ -822,6 +775,4 @@
         {   this.fetcher = fetcher;
         }   // end constructor
-
-
 
         /**
@@ -855,7 +806,5 @@
         }   // end getCustomDataFlavor
 
-
         /* ********  T R A N S F E R A B L E   M E T H O D S  ******** */
-
 
         /**
@@ -884,6 +833,4 @@
         }   // end getTransferDataFlavors
 
-
-
         /**
          * Returns the data encapsulated in this {@link TransferableObject}.
@@ -912,7 +859,4 @@
         }   // end getTransferData
 
-
-
-
         /**
          * Returns true if flavor is one of the supported
@@ -936,5 +880,4 @@
             return false;
         }   // end isDataFlavorSupported
-
 
         /* ********  I N N E R   I N T E R F A C E   F E T C H E R  ******** */
@@ -965,11 +908,5 @@
         }   // end inner interface Fetcher
 
-
-
     }   // end class TransferableObject
 
-
-
-
-
 }   // end class FileDrop
Index: trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java	(revision 2512)
@@ -36,5 +36,5 @@
 
         /**
-         * 
+         *
          * @param text  the button text
          * @param icon  the icon to display. Can be null
@@ -69,5 +69,5 @@
     /**
      * Creates the list buttons to be displayed in the option pane dialog.
-     * 
+     *
      * @param options the option. If null, just creates an OK button and a help button
      * @param helpTopic the help topic. The context sensitive help of all buttons is equal
@@ -100,5 +100,5 @@
     /**
      * Creates the help button
-     * 
+     *
      * @param helpTopic the help topic
      * @return the help button
@@ -125,9 +125,9 @@
      * user clicks on the "Help" button the option dialog remains open and JOSM launches the help
      * browser.
-     * 
+     *
      * helpTopic is the trailing part of a JOSM online help URL, i.e. the part after the leading
      * http://josm.openstreetmap.de/wiki/Help. It should start with a leading '/' and it
      * may include an anchor after a '#'.
-     * 
+     *
      * Examples
      * 
      
@@ -137,5 +137,5 @@
      *
      * In addition, the option buttons display JOSM icons, similar to ExtendedDialog.
-     * 
+     *
      * @param parentComponent the parent component
      * @param msg the message
@@ -244,5 +244,5 @@
 
     /**
-     * 
+     *
      * @param parentComponent
      * @param msg
Index: trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/JMultilineLabel.java	(revision 2512)
@@ -14,5 +14,5 @@
  * required to print it in one line. Additionally the maximum width of the text
  * can be set using setMaxWidth.
- * 
+ *
  * Note that this won't work if JMultilineLabel is put into a JScrollBox or
  * similar as the bounds will never change. Instead scrollbars will be displayed.
@@ -28,5 +28,5 @@
      * Supports both newline characters (\n) as well as the HTML
      * <br> to insert new lines.
-     * 
+     *
      * Use setMaxWidth to limit the width of the label.
      * @param text
@@ -45,5 +45,5 @@
      * Set the maximum width. Use this method instead of setMaximumSize because
      * this saves a little bit of overhead and is actually taken into account.
-     * 
+     *
      * @param width
      */
Index: trunk/src/org/openstreetmap/josm/gui/MapSlider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/MapSlider.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/MapStatus.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/MapStatus.java	(revision 2512)
@@ -183,5 +183,4 @@
                     boolean middleMouseDown = (ms.modifiers & MouseEvent.BUTTON2_DOWN_MASK) != 0;
 
-
                     // Popup Information
                     // display them if the middle mouse button is pressed and
Index: trunk/src/org/openstreetmap/josm/gui/MapView.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/MapView.java	(revision 2512)
@@ -50,5 +50,4 @@
 import org.openstreetmap.josm.gui.layer.markerlayer.PlayHeadMarker;
 import org.openstreetmap.josm.tools.AudioPlayer;
-
 
 /**
@@ -151,5 +150,5 @@
     /**
      * Adds a GPX layer. A GPX layer is added below the lowest data layer.
-     * 
+     *
      * @param layer the GPX layer
      */
@@ -214,5 +213,5 @@
     /**
      * Replies true if the active layer is drawable.
-     * 
+     *
      * @return true if the active layer is drawable, false otherwise
      */
@@ -223,5 +222,5 @@
     /**
      * Replies true if the active layer is visible.
-     * 
+     *
      * @return true if the active layer is visible, false otherwise
      */
@@ -244,5 +243,5 @@
      *   
    • otherwise, the top most layer of any type becomes active
      • 
      * 
    
-     * 
+     *
      * @return the next active data layer
      */
@@ -304,5 +303,5 @@
      * Moves the layer to the given new position. No event is fired, but repaints
      * according to the new Z-Order of the layers.
-     * 
+     *
      * @param layer     The layer to move
      * @param pos       The new position of the layer
@@ -324,5 +323,4 @@
     }
 
-
     public int getLayerPos(Layer layer) {
         int curLayerPos = layers.indexOf(layer);
@@ -335,5 +333,5 @@
      * Creates a list of the visible layers in Z-Order, the layer with the lowest Z-Order
      * first, layer with the highest Z-Order last.
-     * 
+     *
      * @return a list of the visible in Z-Order, the layer with the lowest Z-Order
      * first, layer with the highest Z-Order last.
@@ -483,10 +481,10 @@
     /**
      * Replies an unmodifiable list of layers of a certain type.
-     * 
+     *
      * Example:
      * 
          *     List wmsLayers = getLayersOfType(WMSLayer.class);
      * 
    
-     * 
+     *
      * @return an unmodifiable list of layers of a certain type.
      */
@@ -503,5 +501,5 @@
     /**
      * Replies the number of layers managed by this mav view
-     * 
+     *
      * @return the number of layers managed by this mav view
      */
@@ -512,5 +510,5 @@
     /**
      * Replies true if there is at least one layer in this map view
-     * 
+     *
      * @return true if there is at least one layer in this map view
      */
@@ -522,5 +520,5 @@
      * Sets the active layer to layer. If layer is an instance
      * of {@see OsmDataLayer} also sets {@see #editLayer} to layer.
-     * 
+     *
      * @param layer the layer to be activate; must be one of the layers in the list of layers
      * @exception IllegalArgumentException thrown if layer is not in the lis of layers
@@ -559,5 +557,5 @@
     /**
      * Replies the currently active layer
-     * 
+     *
      * @return the currently active layer (may be null)
      */
@@ -568,5 +566,5 @@
     /**
      * Replies the current edit layer, if any
-     * 
+     *
      * @return the current edit layer. May be null.
      */
@@ -586,5 +584,5 @@
     /**
      * replies true if the list of layers managed by this map view contain layer
-     * 
+     *
      * @param layer the layer
      * @return true if the list of layers managed by this map view contain layer
Index: trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/MultiSplitLayout.java	(revision 2512)
@@ -182,5 +182,4 @@
     public boolean getFloatingDividers() { return floatingDividers; }
 
-
     /**
      * If true, Leaf node bounds match the corresponding component's
@@ -197,5 +196,4 @@
         firePCS("floatingDividers", oldFloatingDividers, floatingDividers);
     }
-
 
     /**
@@ -241,5 +239,4 @@
         return null;
     }
-
 
     private Dimension preferredComponentSize(Node node) {
@@ -335,5 +332,4 @@
     }
 
-
     private Rectangle boundsWithYandHeight(Rectangle bounds, double y, double height) {
         Rectangle r = new Rectangle();
@@ -347,5 +343,4 @@
         return r;
     }
-
 
     private void minimizeSplitBounds(Split split, Rectangle bounds) {
@@ -364,5 +359,4 @@
         split.setBounds(splitBounds);
     }
-
 
     private void layoutShrink(Split split, Rectangle bounds) {
@@ -483,5 +477,4 @@
     }
 
-
     private void layoutGrow(Split split, Rectangle bounds) {
         Rectangle splitBounds = split.getBounds();
@@ -574,5 +567,4 @@
     }
 
-
     /* Second pass of the layout algorithm: branch to layoutGrow/Shrink
      * as needed.
@@ -604,5 +596,4 @@
         }
     }
-
 
     /* First pass of the layout algorithm.
@@ -782,5 +773,4 @@
     }
 
-
     private Divider dividerAt(Node root, int x, int y) {
         if (root instanceof Divider) {
@@ -853,5 +843,4 @@
     }
 
-
     /**
      * Base class for the nodes that model a MultiSplitLayout.
@@ -1072,5 +1061,4 @@
         }
     }
-
 
     /**
@@ -1133,5 +1121,4 @@
     }
 
-
     /**
      * Models a single vertical/horiztonal divider.
@@ -1163,5 +1150,4 @@
         }
     }
-
 
     private static void throwParseException(StreamTokenizer st, String msg) throws Exception {
@@ -1329,5 +1315,4 @@
     }
 
-
     private static void printModel(String indent, Node root) {
         if (root instanceof Split) {
Index: trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/MultiSplitPane.java	(revision 2512)
@@ -351,5 +351,4 @@
     }
 
-
     private class InputHandler extends MouseInputAdapter implements KeyListener {
 
Index: trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/OsmPrimitivRenderer.java	(revision 2512)
@@ -72,5 +72,5 @@
      * build the tool tip text for an {@see OsmPrimitive}. It consist of the formatted
      * key/value pairs for this primitive.
-     * 
+     *
      * @param primitive
      * @return the tool tip text
Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java	(revision 2512)
@@ -108,5 +108,5 @@
      * Appends a log message to the progress dialog. If the log area isn't visible yet
      * it becomes visible. The height of the progress dialog is slightly increased too.
-     * 
+     *
      * @param message the message to append to the log. Ignore if null or white space only.
      */
@@ -126,5 +126,5 @@
     /**
      * Sets whether the cancel button is enabled or not
-     * 
+     *
      * @param enabled true, if the cancel button is enabled; false otherwise
      */
@@ -136,5 +136,5 @@
      * Installs a callback for the cancel button. If callback is null, all action listeners
      * are removed from the cancel button.
-     * 
+     *
      * @param callback the cancel callback
      */
Index: trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java	(revision 2512)
@@ -39,5 +39,5 @@
     /**
      * Create the runnable object with a given message for the user.
-     * 
+     *
      * @param title message for the user
      * @param ignoreException If true, exception will be propagated to calling code. If false then
Index: trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java	(revision 2512)
@@ -186,3 +186,2 @@
     }
 }
-
Index: trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/ScrollViewport.java	(revision 2512)
@@ -67,5 +67,5 @@
     private JViewport vp = new JViewport();
     private JComponent component = null;
-    
+
     private List buttons = new ArrayList();
 
@@ -85,5 +85,5 @@
     public ScrollViewport(int direction) {
         setLayout(new BorderLayout());
-        
+
         JButton button;
 
@@ -137,5 +137,5 @@
 
         showOrHideButtons();
-        
+
         timer.setRepeats(true);
         timer.setInitialDelay(400);
@@ -203,5 +203,5 @@
      */
     public void showOrHideButtons() {
-        boolean needButtons = vp.getViewSize().height > vp.getViewRect().height || 
+        boolean needButtons = vp.getViewSize().height > vp.getViewRect().height ||
                               vp.getViewSize().width > vp.getViewRect().width;
         for (JButton b : buttons) {
@@ -209,5 +209,5 @@
         }
     }
-    
+
     public Rectangle getViewRect() {
         return vp.getViewRect();
Index: trunk/src/org/openstreetmap/josm/gui/SelectionManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/SelectionManager.java	(revision 2512)
@@ -156,5 +156,4 @@
         int buttonPressed = e.getModifiersEx() & (MouseEvent.BUTTON1_DOWN_MASK | MouseEvent.BUTTON3_DOWN_MASK);
 
-
         if (buttonPressed != 0) {
             if (mousePosStart == null) {
@@ -197,5 +196,4 @@
         }
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java	(revision 2512)
@@ -51,5 +51,5 @@
  * This dialog is used to get a user confirmation that a collection of primitives can be removed
  * from their parent relations.
- * 
+ *
  */
 public class DeleteFromRelationConfirmationDialog extends JDialog implements TableModelListener {
@@ -59,5 +59,5 @@
     /**
      * Replies the unique instance of this dialog
-     * 
+     *
      * @return
      */
@@ -151,5 +151,5 @@
     /**
      * Replies the data model used in this dialog
-     * 
+     *
      * @return the data model
      */
@@ -160,5 +160,5 @@
     /**
      * Replies true if the dialog was canceled
-     * 
+     *
      * @return true if the dialog was canceled
      */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairListCellRenderer.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ComparePairType.java	(revision 2512)
@@ -38,5 +38,5 @@
     /**
      * replies the display name
-     * 
+     *
      * @return the display name
      */
@@ -48,5 +48,5 @@
      * replies true, if role is participating in this comparison
      * pair
-     * 
+     *
      * @param role  the list role
      * @return true, if role is participating in this comparison
@@ -63,5 +63,5 @@
      * replies the pair of {@see ListRole}s participating in this comparison
      * pair
-     * 
+     *
      * @return  the pair of list roles
      */
@@ -73,5 +73,5 @@
      * replies the opposite role of role participating in this comparison
      * pair
-     * 
+     *
      * @param role one of the two roles in this pair
      * @return the opposite role
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java	(revision 2512)
@@ -34,5 +34,5 @@
 /**
  * An UI component for resolving conflicts between two {@see OsmPrimitive}s.
- * 
+ *
  * This component emits {@see PropertyChangeEvent}s for three properties:
  * 
      
@@ -44,5 +44,5 @@
  *   their primitive
  * 
    
- * 
+ *
  */
 public class ConflictResolver extends JPanel implements PropertyChangeListener  {
@@ -64,5 +64,4 @@
      */
     static public final String THEIR_PRIMITIVE_PROP = ConflictResolver.class.getName() + ".theirPrimitive";
-
 
     private static final Logger logger = Logger.getLogger(ConflictResolver.class.getName());
@@ -131,5 +130,5 @@
     /**
      * Sets the {@see OsmPrimitive} in the role "my"
-     * 
+     *
      * @param my the primitive in the role "my"
      */
@@ -144,5 +143,5 @@
     /**
      * Sets the {@see OsmPrimitive} in the role "their".
-     * 
+     *
      * @param their the primitive in the role "their"
      */
@@ -209,8 +208,8 @@
     /**
      * populates the conflict resolver with the conflicts between my and their
-     * 
+     *
      * @param my   my primitive (i.e. the primitive in the local dataset)
      * @param their their primitive (i.e. the primitive in the server dataset)
-     * 
+     *
      */
     public void populate(OsmPrimitive my, OsmPrimitive their) {
@@ -250,5 +249,5 @@
      * Builds the resolution command(s) for the resolved conflicts in this
      * ConflictResolver
-     * 
+     *
      * @return the resolution command
      */
@@ -282,5 +281,5 @@
     /**
      * Updates the state of the property {@see #RESOLVED_COMPLETELY_PROP}
-     * 
+     *
      */
     protected void updateResolvedCompletely() {
@@ -319,5 +318,5 @@
     /**
      * Replies true all differences in this conflicts are resolved
-     * 
+     *
      * @return true all differences in this conflicts are resolved
      */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMergeModel.java	(revision 2512)
@@ -31,5 +31,5 @@
  *   
  • the list of merged entries
    • 
  * 
- * 
+ *
  * A ListMergeModel is a factory for three {@see TableModel}s and three {@see ListSelectionModel}s:
  * 
      
@@ -42,5 +42,5 @@
  * decisions. {@see PropertyChangeListener}s can register for property value changes of
  * {@see #PROP_FROZEN}.
- * 
+ *
  * ListMergeModel is an abstract class. Three methods have to be implemented by subclasses:
  * 
        
@@ -74,10 +74,8 @@
     private final ComparePairListModel comparePairListModel;
 
-
-
     /**
      * Creates a clone of an entry of type T suitable to be included in the
      * list of merged entries
-     * 
+     *
      * @param entry the entry
      * @return the cloned entry
@@ -88,5 +86,5 @@
      * checks whether two entries are equal. This is not necessarily the same as
      * e1.equals(e2).
-     * 
+     *
      * @param e1  the first entry
      * @param e2  the second entry
@@ -97,15 +95,13 @@
     /**
      * Handles method dispatches from {@see TableModel#setValueAt(Object, int, int)}.
-     * 
+     *
      * @param model the table model
      * @param value  the value to be set
      * @param row  the row index
      * @param col the column index
-     * 
+     *
      * @see TableModel#setValueAt(Object, int, int)
      */
     protected abstract void setValueAt(DefaultTableModel model, Object value, int row, int col);
-
-
 
     protected void buildMyEntriesTableModel() {
@@ -246,5 +242,5 @@
      * list of merged nodes. Inserts the nodes at the top of the list of merged
      * nodes.
-     * 
+     *
      * @param rows the indices
      */
@@ -257,5 +253,5 @@
      * list of merged nodes. Inserts the nodes at the top of the list of merged
      * nodes.
-     * 
+     *
      * @param rows the indices
      */
@@ -268,5 +264,5 @@
      * list of merged nodes. Inserts the nodes at the end of the list of merged
      * nodes.
-     * 
+     *
      * @param source the list of nodes to copy from
      * @param rows the indices
@@ -290,5 +286,5 @@
      * list of merged nodes. Inserts the nodes at the end of the list of merged
      * nodes.
-     * 
+     *
      * @param rows the indices
      */
@@ -301,5 +297,5 @@
      * list of merged nodes. Inserts the nodes at the end of the list of merged
      * nodes.
-     * 
+     *
      * @param rows the indices
      */
@@ -311,10 +307,10 @@
      * Copies the nodes given by indices in rows from the list of  nodes source to the
      * list of merged nodes. Inserts the nodes before row given by current.
-     * 
+     *
      * @param source the list of nodes to copy from
      * @param rows the indices
      * @param current the row index before which the nodes are inserted
      * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
-     * 
+     *
      */
     protected void copyBeforeCurrent(ListRole source, int [] rows, int current) {
@@ -336,9 +332,9 @@
      * Copies the nodes given by indices in rows from the list of my nodes to the
      * list of merged nodes. Inserts the nodes before row given by current.
-     * 
+     *
      * @param rows the indices
      * @param current the row index before which the nodes are inserted
      * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
-     * 
+     *
      */
     public void copyMyBeforeCurrent(int [] rows, int current) {
@@ -349,9 +345,9 @@
      * Copies the nodes given by indices in rows from the list of their nodes to the
      * list of merged nodes. Inserts the nodes before row given by current.
-     * 
+     *
      * @param rows the indices
      * @param current the row index before which the nodes are inserted
      * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
-     * 
+     *
      */
     public void copyTheirBeforeCurrent(int [] rows, int current) {
@@ -362,10 +358,10 @@
      * Copies the nodes given by indices in rows from the list of  nodes source to the
      * list of merged nodes. Inserts the nodes after the row given by current.
-     * 
+     *
      * @param source the list of nodes to copy from
      * @param rows the indices
      * @param current the row index after which the nodes are inserted
      * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
-     * 
+     *
      */
     protected void copyAfterCurrent(ListRole source, int [] rows, int current) {
@@ -393,9 +389,9 @@
      * Copies the nodes given by indices in rows from the list of my nodes to the
      * list of merged nodes. Inserts the nodes after the row given by current.
-     * 
+     *
      * @param rows the indices
      * @param current the row index after which the nodes are inserted
      * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
-     * 
+     *
      */
     public void copyMyAfterCurrent(int [] rows, int current) {
@@ -406,9 +402,9 @@
      * Copies the nodes given by indices in rows from the list of my nodes to the
      * list of merged nodes. Inserts the nodes after the row given by current.
-     * 
+     *
      * @param rows the indices
      * @param current the row index after which the nodes are inserted
      * @exception IllegalArgumentException thrown, if current < 0 or >= #nodes in list of merged nodes
-     * 
+     *
      */
     public void copyTheirAfterCurrent(int [] rows, int current) {
@@ -419,7 +415,7 @@
      * Moves the nodes given by indices in rows  up by one position in the list
      * of merged nodes.
-     * 
-     * @param rows the indices
-     * 
+     *
+     * @param rows the indices
+     *
      */
     public void moveUpMerged(int [] rows) {
@@ -446,5 +442,5 @@
      * Moves the nodes given by indices in rows down by one position in the list
      * of merged nodes.
-     * 
+     *
      * @param rows the indices
      */
@@ -473,5 +469,5 @@
      * Removes the nodes given by indices in rows from the list
      * of merged nodes.
-     * 
+     *
      * @param rows the indices
      */
@@ -490,9 +486,8 @@
     }
 
-
     /**
      * Replies true if the list of my entries and the list of their
      * entries are equal
-     * 
+     *
      * @return true, if the lists are equal; false otherwise
      */
@@ -508,9 +503,8 @@
     }
 
-
     /**
      * This an adapter between a {@see JTable} and one of the three entry lists
      * in the role {@see ListRole} managed by the {@see ListMergeModel}.
-     * 
+     *
      * From the point of view of the {@see JTable} it is a {@see TableModel}.
      *
@@ -524,5 +518,5 @@
 
         /**
-         * 
+         *
          * @param role the role
          */
@@ -562,8 +556,8 @@
          * replies true if the {@see ListRole} of this {@see EntriesTableModel}
          * participates in the current {@see ComparePairType}
-         * 
+         *
          * @return true, if the if the {@see ListRole} of this {@see EntriesTableModel}
          * participates in the current {@see ComparePairType}
-         * 
+         *
          * @see ComparePairListModel#getSelectedComparePair()
          */
@@ -577,5 +571,5 @@
          * replies true if the entry at row is equal to the entry at the
          * same position in the opposite list of the current {@see ComparePairType}.
-         * 
+         *
          * @param row  the row number
          * @return true if the entry at row is equal to the entry at the
@@ -601,5 +595,5 @@
          * replies true if the entry at the current position is present in the opposite list
          * of the current {@see ComparePairType}.
-         * 
+         *
          * @param row the current row
          * @return true if the entry at the current position is present in the opposite list
@@ -629,5 +623,5 @@
         /**
          * replies the opposite list of entries with respect to the current {@see ComparePairType}
-         * 
+         *
          * @return the opposite list of entries
          */
@@ -645,8 +639,8 @@
      * This is the selection model to be used in a {@see JTable} which displays
      * an entry list managed by {@see ListMergeModel}.
-     * 
+     *
      * The model ensures that only rows displaying an entry in the entry list
      * can be selected. "Empty" rows can't be selected.
-     * 
+     *
      * @see ListMergeModel#getMySelectionModel()
      * @see ListMergeModel#getMergedSelectionModel()
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java	(revision 2512)
@@ -78,5 +78,4 @@
     private  JLabel lblTheirVersion;
 
-
     private  JLabel lblFrozenState;
 
@@ -105,5 +104,4 @@
 
         myEntriesTable.getSelectionModel().addListSelectionListener(copyEndLeftAction);
-
 
         theirEntriesTable.getSelectionModel().addListSelectionListener(copyStartRightAction);
@@ -385,5 +383,4 @@
         add(buildFrozeStateControlPanel(), gc);
 
-
         wireActionsToSelectionModels();
     }
@@ -518,5 +515,4 @@
     }
 
-
     class CopyStartRightAction extends AbstractAction implements ListSelectionListener {
 
@@ -540,5 +536,4 @@
         }
     }
-
 
     class CopyEndRightAction extends AbstractAction implements ListSelectionListener {
@@ -593,5 +588,4 @@
     }
 
-
     class CopyAfterCurrentRightAction extends AbstractAction implements ListSelectionListener {
 
@@ -622,5 +616,4 @@
         }
     }
-
 
     class MoveUpMergedAction extends AbstractAction implements ListSelectionListener {
@@ -807,5 +800,4 @@
     }
 
-
     public void update(Observable o, Object arg) {
         lblMyVersion.setText(
@@ -839,5 +831,4 @@
             observable = new Observable();
         }
-
 
         /**
@@ -947,5 +938,4 @@
             });
 
-
             observable.addObserver(
                     new Observer() {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/ListRole.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/MergeDecisionType.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListColumnModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java	(revision 2512)
@@ -18,5 +18,4 @@
 
     private static final Logger logger = Logger.getLogger(NodeListMergeModel.class.getName());
-
 
     /**
@@ -73,5 +72,4 @@
     }
 
-
     @Override
     public boolean isEqualEntry(Node e1, Node e2) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMerger.java	(revision 2512)
@@ -12,9 +12,8 @@
 /**
  * A UI component for resolving conflicts in the node lists of two {@see Way}s.
- * 
+ *
  */
 public class NodeListMerger extends ListMerger {
     private static final Logger logger = Logger.getLogger(NodeListMerger.class.getName());
-
 
     public NodeListMerger() {
@@ -64,5 +63,4 @@
     }
 
-
     public void populate(Way my, Way their) {
         ((NodeListMergeModel)model).populate(my, their);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListTableCellRenderer.java	(revision 2512)
@@ -24,5 +24,5 @@
 /**
  * This is the {@see TableCellRenderer} used in the node tables of {@see NodeListMerger}.
- * 
+ *
  */
 public  class NodeListTableCellRenderer extends JLabel implements TableCellRenderer {
@@ -54,5 +54,5 @@
      * build the tool tip text for an {@see OsmPrimitive}. It consist of the formatted
      * key/value pairs for this primitive.
-     * 
+     *
      * @param primitive
      * @return the tool tip text
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/OperationCancelledException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/OperationCancelledException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/OperationCancelledException.java	(revision 2512)
@@ -24,4 +24,3 @@
     }
 
-
 }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java	(revision 2512)
@@ -180,5 +180,4 @@
     }
 
-
     /**
      * replies the coordinates of my {@see OsmPrimitive}. null, if my primitive hasn't
@@ -253,5 +252,4 @@
         return null;
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java	(revision 2512)
@@ -28,5 +28,5 @@
  * This class represents a UI component for resolving conflicts in some properties
  * of {@see OsmPrimitive}.
- * 
+ *
  */
 public class PropertiesMerger extends JPanel implements Observer {
@@ -127,5 +127,4 @@
         add(btnKeepMyCoordinates, gc);
 
-
         gc.gridx = 3;
         gc.gridy = 1;
@@ -202,5 +201,4 @@
         btnKeepMyDeletedState.setName("button.keepmydeletedstate");
         add(btnKeepMyDeletedState, gc);
-
 
         gc.gridx = 3;
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListColumnModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberListMergeModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberMerger.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellEditor.java	(revision 2512)
@@ -18,5 +18,4 @@
  */
 public class RelationMemberTableCellEditor extends AbstractCellEditor implements TableCellEditor{
-
 
     private final JTextField editor;
@@ -42,5 +41,4 @@
     }
 
-
     public Object getCellEditorValue() {
         return editor.getText();
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/relation/RelationMemberTableCellRenderer.java	(revision 2512)
@@ -65,5 +65,4 @@
         rowNumberBorder = BorderFactory.createEmptyBorder(0,4,0,0);
     }
-
 
     public String buildToolTipText(OsmPrimitive primitive) {
@@ -109,5 +108,4 @@
         setToolTipText(null);
     }
-
 
     protected void renderBackground(ListMergeModel.EntriesTableModel model, RelationMember member, int row, int col, boolean isSelected) {
@@ -188,5 +186,4 @@
     }
 
-
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MergedTableCellRenderer.java	(revision 2512)
@@ -15,5 +15,4 @@
     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
 
-    
     protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
         if (isSelected) {
@@ -24,11 +23,10 @@
             setBackground(BGCOLOR_MINE);
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setBackground(BGCOLOR_THEIR); 
+            setBackground(BGCOLOR_THEIR);
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setBackground(BGCOLOR_UNDECIDED);
-        }        
+        }
     }
-    
-    
+
     @Override
     protected void renderKey(TagMergeItem item, boolean isSelected) {
@@ -67,5 +65,5 @@
                 setToolTipText(item.getTheirTagValue());
             } else {
-                // should not happen 
+                // should not happen
             }
         }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/MineTableCellRenderer.java	(revision 2512)
@@ -14,5 +14,5 @@
     public final static Color BGCOLOR_THEIR = Color.white;
     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
-    
+
     protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
         if (isSelected)  {
@@ -20,24 +20,24 @@
             return;
         }
-        
+
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
             setBackground(BGCOLOR_MINE);
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setBackground(BGCOLOR_THEIR); 
+            setBackground(BGCOLOR_THEIR);
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setBackground(BGCOLOR_UNDECIDED);
-        }        
+        }
     }
-    
+
     protected void setTextColor(TagMergeItem item) {
         if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
             setForeground(Color.black);
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setForeground(Color.LIGHT_GRAY); 
+            setForeground(Color.LIGHT_GRAY);
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setForeground(Color.black);
-        }                
+        }
     }
-    
+
     @Override
     protected void renderKey(TagMergeItem item, boolean isSelected) {
@@ -48,5 +48,5 @@
             setToolTipText(tr("My dataset does not include a tag with key {0}", item.getKey()));
         } else {
-            setText(item.getKey());    
+            setText(item.getKey());
             setToolTipText(item.getKey());
         }
@@ -61,7 +61,7 @@
             setToolTipText(tr("My dataset does not include a tag with key {0}", item.getKey()));
         } else {
-            setText(item.getMyTagValue());    
+            setText(item.getMyTagValue());
             setToolTipText(item.getMyTagValue());
-        }        
+        }
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeColumnModel.java	(revision 2512)
@@ -11,8 +11,8 @@
 
     protected void createColumns(TableCellRenderer renderer) {
-        
+
         TableColumn col = null;
-        
-        // column 0 - Key   
+
+        // column 0 - Key
         col = new TableColumn(0);
         col.setHeaderValue(tr("Key"));
@@ -20,6 +20,6 @@
         col.setCellRenderer(renderer);
         addColumn(col);
-        
-        // column 1 - Value   
+
+        // column 1 - Value
         col = new TableColumn(1);
         col.setHeaderValue(tr("Value"));
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeItem.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeModel.java	(revision 2512)
@@ -17,14 +17,14 @@
 /**
  * This is the {@see TableModel} used in the tables of the {@see TagMerger}.
- * 
+ *
  * The model can {@see #populate(OsmPrimitive, OsmPrimitive)} itself from the conflicts
  * in the tag sets of two {@see OsmPrimitive}s. Internally, it keeps a list of {@see TagMergeItem}s.
- * 
+ *
  *  {@see #decide(int, MergeDecisionType)} and {@see #decide(int[], MergeDecisionType)} can be used
  *  to remember a merge decision for a specific row in the model.
- * 
+ *
  *  The model notifies {@see PropertyChangeListener}s about updates of the number of
  *  undecided tags (see {@see #PROP_NUM_UNDECIDED_TAGS}).
- * 
+ *
  */
 public class TagMergeModel extends DefaultTableModel {
@@ -40,5 +40,4 @@
 
     private int numUndecidedTags = 0;
-
 
     public TagMergeModel() {
@@ -81,5 +80,5 @@
      * refreshes the number of undecided tag conflicts after an update in the list of
      * {@see TagMergeItem}s. Notifies {@see PropertyChangeListener} if necessary.
-     * 
+     *
      */
     protected void refreshNumUndecidedTags() {
@@ -99,8 +98,8 @@
      * Populate the model with conflicts between the tag sets of the two
      * {@see OsmPrimitive} my and their.
-     * 
+     *
      * @param my  my primitive (i.e. the primitive from the local dataset)
      * @param their their primitive (i.e. the primitive from the server dataset)
-     * 
+     *
      */
     public void populate(OsmPrimitive my, OsmPrimitive their) {
@@ -124,5 +123,5 @@
     /**
      * add a {@see TagMergeItem} to the model
-     * 
+     *
      * @param item the item
      */
@@ -143,5 +142,5 @@
      * set the merge decision of the {@see TagMergeItem} in row row
      * to decision.
-     * 
+     *
      * @param row  the row
      * @param decision the decision
@@ -156,5 +155,5 @@
      * set the merge decision of all {@see TagMergeItem} given by indices in rows
      * to decision.
-     * 
+     *
      * @param row  the array of row indices
      * @param decision the decision
@@ -175,5 +174,4 @@
         return tagMergeItems == null ? 0 : tagMergeItems.size();
     }
-
 
     @Override
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMergeTableCellRenderer.java	(revision 2512)
@@ -14,7 +14,7 @@
 
     protected  abstract void renderKey(TagMergeItem item, boolean isSelected );
-    
+
     protected abstract void renderValue(TagMergeItem item, boolean isSelected);
-    
+
     protected void reset() {
         setOpaque(true);
@@ -22,12 +22,12 @@
         setForeground(Color.black);
     }
-    
+
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row,
             int col) {
-        
-        reset();        
+
+        reset();
         TagMergeItem item = (TagMergeItem)value;
         switch(col) {
-        case 0: 
+        case 0:
             renderKey(item, isSelected);
             break;
@@ -36,9 +36,9 @@
             break;
         default:
-            // should not happen, but just in case 
+            // should not happen, but just in case
             throw new IllegalArgumentException(tr("Parameter 'col' must be 0 or 1. Got {0}.", col));
         }
         return this;
     }
-    
+
 }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java	(revision 2512)
@@ -44,5 +44,5 @@
     /**
      * embeds table in a new {@see JScrollPane} and returns th scroll pane
-     * 
+     *
      * @param table the table
      * @return the scroll pane embedding the table
@@ -59,5 +59,5 @@
     /**
      * builds the table for my tag set (table already embedded in a scroll pane)
-     * 
+     *
      * @return the table (embedded in a scroll pane)
      */
@@ -75,5 +75,5 @@
     /**
      * builds the table for their tag set (table already embedded in a scroll pane)
-     * 
+     *
      * @return the table (embedded in a scroll pane)
      */
@@ -91,5 +91,5 @@
     /**
      * builds the table for the merged tag set (table already embedded in a scroll pane)
-     * 
+     *
      * @return the table (embedded in a scroll pane)
      */
@@ -208,9 +208,7 @@
         theirTable.getSelectionModel().addListSelectionListener(keepTheirAction);
 
-
         DoubleClickAdapter dblClickAdapter = new DoubleClickAdapter();
         mineTable.addMouseListener(dblClickAdapter);
         theirTable.addMouseListener(dblClickAdapter);
-
 
         gc.gridx = 2;
@@ -237,5 +235,5 @@
     /**
      * replies the model used by this tag merger
-     * 
+     *
      * @return the model
      */
@@ -307,5 +305,5 @@
      * the registerd Adjustables is updated the adjustment of
      * the other registered Adjustables is adjusted too.
-     * 
+     *
      */
     class AdjustmentSynchronizer implements AdjustmentListener {
@@ -336,5 +334,5 @@
     /**
      * Handler for double clicks on entries in the three tag tables.
-     * 
+     *
      */
     class DoubleClickAdapter extends MouseAdapter {
@@ -368,5 +366,5 @@
      * Sets the currently selected tags in the table of merged tags to state
      * {@see MergeDecisionType#UNDECIDED}
-     * 
+     *
      */
     class UndecideAction extends AbstractAction implements ListSelectionListener  {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TheirTableCellRenderer.java	(revision 2512)
@@ -15,5 +15,4 @@
     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
 
-    
     protected void setBackgroundColor(TagMergeItem item, boolean isSelected) {
         if (isSelected) {
@@ -24,20 +23,20 @@
             setBackground(BGCOLOR_MINE);
         } else if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
-            setBackground(BGCOLOR_THEIR); 
+            setBackground(BGCOLOR_THEIR);
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setBackground(BGCOLOR_UNDECIDED);
-        }        
+        }
     }
-    
+
     protected void setTextColor(TagMergeItem item) {
         if (MergeDecisionType.KEEP_THEIR.equals(item.getMergeDecision())) {
             setForeground(Color.black);
         } else if (MergeDecisionType.KEEP_MINE.equals(item.getMergeDecision())) {
-            setForeground(Color.LIGHT_GRAY); 
+            setForeground(Color.LIGHT_GRAY);
         } else if (MergeDecisionType.UNDECIDED.equals(item.getMergeDecision())) {
             setForeground(Color.black);
-        }                
+        }
     }
-    
+
     @Override
     protected void renderKey(TagMergeItem item, boolean isSelected) {
@@ -48,5 +47,5 @@
             setToolTipText(tr("Their dataset does not include a tag with key {0}", item.getKey()));
         } else {
-            setText(item.getKey());    
+            setText(item.getKey());
             setToolTipText(item.getKey());
         }
@@ -61,7 +60,7 @@
             setToolTipText(tr("Their dataset does not include a tag with key {0}", item.getKey()));
         } else {
-            setText(item.getTheirTagValue());    
+            setText(item.getTheirTagValue());
             setToolTipText(item.getTheirTagValue());
-        }        
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/CombinePrimitiveResolverDialog.java	(revision 2512)
@@ -43,12 +43,12 @@
  * This dialog helps to resolve conflicts occurring when ways are combined or
  * nodes are merged.
- * 
+ *
  * There is a singleton instance of this dialog which can be retrieved using
  * {@see #getInstance()}.
- * 
+ *
  * The dialog uses two models: one  for resolving tag conflicts, the other
  * for resolving conflicts in relation memberships. For both models there are accessors,
  * i.e {@see #getTagConflictResolverModel()} and {@see #getRelationMemberConflictResolverModel()}.
- * 
+ *
  * Models have to be populated before the dialog is launched. Example:
  * 
        @@ -58,13 +58,13 @@
  *    dialog.prepareDefaultDecisions();
  * 
        
- * 
+ *
  * You should also set the target primitive which other primitives (ways or nodes) are
  * merged to, see {@see #setTargetPrimitive(OsmPrimitive)}.
- * 
+ *
  * After the dialog is closed use {@see #isCancelled()} to check whether the user canceled
  * the dialog. If it wasn't canceled you may build a collection of {@see Command} objects
  * which reflect the conflict resolution decisions the user made in the dialog:
  * see {@see #buildResolutionCommands()}
- * 
+ *
  *
  */
@@ -76,5 +76,5 @@
     /**
      * Replies the unique instance of the dialog
-     * 
+     *
      * @return the unique instance of the dialog
      */
@@ -92,5 +92,5 @@
     private JPanel pnlButtons;
     private OsmPrimitive targetPrimitive;
-    
+
     /** the private help action */
     private ContextSensitiveHelpAction helpAction;
@@ -101,5 +101,5 @@
      * Replies the target primitive the collection of primitives is merged
      * or combined to.
-     * 
+     *
      * @return the target primitive
      */
@@ -111,5 +111,5 @@
      * Sets the primitive the collection of primitives is merged or combined
      * to.
-     * 
+     *
      * @param primitive the target primitive
      */
@@ -118,5 +118,5 @@
         updateTitle();
         if (primitive instanceof Way) {
-            pnlRelationMemberConflictResolver.initForWayCombining();            
+            pnlRelationMemberConflictResolver.initForWayCombining();
         } else if (primitive instanceof Node) {
             pnlRelationMemberConflictResolver.initForNodeMerging();
@@ -343,5 +343,4 @@
     }
 
-
     class CancelAction extends AbstractAction {
 
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellEditor.java	(revision 2512)
@@ -25,13 +25,12 @@
  * proposed tag values. The editor also allows to select all proposed valued or
  * to remove the tag.
- * 
+ *
  * The editor responds intercepts some keys and interprets them as navigation keys. It
  * forwards navigation events to {@see NavigationListener}s registred with this editor.
  * You should register the parent table using this editor as {@see NavigationListener}.
- * 
+ *
  * {@see KeyEvent#VK_ENTER} and {@see KeyEvent#VK_TAB} trigger a {@see NavigationListener#gotoNextDecision()}.
  */
 public class MultiValueCellEditor extends AbstractCellEditor implements TableCellEditor{
-
 
     public static interface NavigationListener {
@@ -142,5 +141,4 @@
     }
 
-
     /**
      * The cell renderer used in the combo box
@@ -191,3 +189,2 @@
     }
 }
-
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java	(revision 2512)
@@ -20,5 +20,5 @@
 /**
  * This is a {@see TableCellRenderer} for {@see MultiValueResolutionDecision}s.
- * 
+ *
  */
 public class MultiValueCellRenderer extends JLabel implements TableCellRenderer {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueDecisionType.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java	(revision 2512)
@@ -17,5 +17,5 @@
 /**
  * Represents a decision for a conflict due to multiple possible value for a tag.
- * 
+ *
  *
  */
@@ -41,5 +41,5 @@
      * Creates a new decision for the tag collection tags.
      * All tags must have the same key.
-     * 
+     *
      * @param tags the tags. Must not be null.
      * @exception IllegalArgumentException  thrown if tags is null
@@ -90,5 +90,5 @@
     /**
      * Apply the decision to keep exactly one value
-     * 
+     *
      * @param value  the value to keep
      * @throws IllegalArgumentException thrown if value is null
@@ -106,5 +106,5 @@
     /**
      * sets a new value for this
-     * 
+     *
      * @param value the new vlaue
      */
@@ -120,5 +120,5 @@
     /**
      * marks this as undecided
-     * 
+     *
      */
     public void undecide() {
@@ -128,5 +128,5 @@
     /**
      * Replies the chosen value
-     * 
+     *
      * @return the chosen value
      * @throws IllegalStateException thrown if this resolution is not yet decided
@@ -145,5 +145,5 @@
     /**
      * Replies the list of possible, non empty values
-     * 
+     *
      * @return the list of possible, non empty values
      */
@@ -158,5 +158,5 @@
     /**
      * Replies the key of the tag to be resolved by this resolution
-     * 
+     *
      * @return the key of the tag to be resolved by this resolution
      */
@@ -167,5 +167,5 @@
     /**
      * Replies true if the empty value is a possible value in this resolution
-     * 
+     *
      * @return true if the empty value is a possible value in this resolution
      */
@@ -176,5 +176,5 @@
     /**
      * Replies true, if this resolution has more than 1 possible non-empty values
-     * 
+     *
      * @return true, if this resolution has more than 1 possible non-empty values
      */
@@ -185,5 +185,5 @@
     /**
      * Replies  true if this resolution is decided
-     * 
+     *
      * @return true if this resolution is decided
      */
@@ -194,5 +194,5 @@
     /**
      * Replies the type of the resolution
-     * 
+     *
      * @return the type of the resolution
      */
@@ -203,8 +203,8 @@
     /**
      * Applies the resolution to an {@see OsmPrimitive}
-     * 
+     *
      * @param primitive the primitive
      * @throws IllegalStateException thrown if this resolution is not resolved yet
-     * 
+     *
      */
     public void applyTo(OsmPrimitive primitive) throws IllegalStateException{
@@ -223,5 +223,5 @@
     /**
      * Applies this resolution to a collection of primitives
-     * 
+     *
      * @param primtives the collection of primitives
      * @throws IllegalStateException thrown if this resolution is not resolved yet
@@ -239,5 +239,5 @@
     /**
      * Builds a change command for applying this resolution to a primitive
-     * 
+     *
      * @param primitive  the primitive
      * @return the change command
@@ -258,5 +258,5 @@
     /**
      * Builds a change command for applying this resolution to a collection of primitives
-     * 
+     *
      * @param primitives  the collection of primitives
      * @return the change command
@@ -278,5 +278,5 @@
      * Replies a tag representing the current resolution. Null, if this resolution is not resolved
      * yet.
-     * 
+     *
      * @return a tag representing the current resolution. Null, if this resolution is not resolved
      * yet
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java	(revision 2512)
@@ -136,5 +136,5 @@
     /**
      * Initializes the conflict resolver for a specific type of primitives
-     * 
+     *
      * @param type the type of primitives
      * @param tc the tags belonging to this type of primitives
@@ -151,5 +151,5 @@
     /**
      * Populates the conflict resolver with one tag collection
-     * 
+     *
      * @param tagsForAllPrimitives  the tag collection
      * @param sourceStatistics histogram of tag source, number of primitives of each type in the source
@@ -195,5 +195,5 @@
     /**
      * Populate the tag conflict resolver with tags for each type of primitives
-     * 
+     *
      * @param tagsForNodes the tags belonging to nodes in the paste source
      * @param tagsForWays the tags belonging to way in the paste source
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecision.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionEditor.java	(revision 2512)
@@ -37,5 +37,4 @@
     private RelationMemberConflictDecisionType originalValue;
 
-
     public void addCellEditorListener(CellEditorListener l) {
         tableCellEditorSupport.addCellEditorListener(l);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionRenderer.java	(revision 2512)
@@ -16,6 +16,6 @@
 public class RelationMemberConflictDecisionRenderer extends JLabel implements TableCellRenderer, ListCellRenderer{
 
-    private JComboBox cbDecisionTypes; 
-    
+    private JComboBox cbDecisionTypes;
+
     protected void resetTableRenderer() {
         setOpaque(true);
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictDecisionType.java	(revision 2512)
@@ -25,5 +25,4 @@
     UNDECIDED;
 
-
     static public void prepareLabel(RelationMemberConflictDecisionType decision, JLabel label) {
         switch(decision) {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java	(revision 2512)
@@ -50,5 +50,5 @@
     protected void build() {
         setLayout(new GridBagLayout());
-        JPanel pnl = new JPanel();        
+        JPanel pnl = new JPanel();
         pnl.setLayout(new BorderLayout());
         pnl.add(lblHeader = new JMultilineLabel(""));
@@ -60,5 +60,5 @@
         add(pnl, gc);
         model = new RelationMemberConflictResolverModel();
-        
+
         gc.gridy = 1;
         gc.weighty = 1.0;
@@ -89,5 +89,5 @@
                     public void focusGained(FocusEvent e) {
                         tfRole.selectAll();
-                    }                    
+                    }
                 }
         );
@@ -104,5 +104,5 @@
                         + "to all modified relations."));
         pnl.add(cbTagRelations);
-        pnl.add(new JLabel(trc("tag", "Key:")));        
+        pnl.add(new JLabel(trc("tag", "Key:")));
         pnl.add(tfKey = new AutoCompletingTextField(10));
         tfKey.setToolTipText(tr("Enter a tag key, i.e. fixme"));
@@ -119,9 +119,9 @@
         build();
     }
-    
+
     public void initForWayCombining() {
        lblHeader.setText(tr("The combined ways are members in one ore more relations. "
                 + "Please decide whether your want to keep these memberships "
-                + "for the combined way or whether you want to remove them.
        " 
+                + "for the combined way or whether you want to remove them.
        "
                 + "The default is to keep them: the combined way will take the place of the original way in the membership."
                         + ""));
@@ -132,5 +132,5 @@
         lblHeader.setText(tr("The merged nodes are members in one ore more relations. "
                  + "Please decide whether your want to keep these memberships "
-                 + "for the target node or whether you want to remove them.
        " 
+                 + "for the target node or whether you want to remove them.
        "
                  + "The default is to keep them: the target node will take the place of the original node in the membership."
                          + ""));
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverColumnModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverModel.java	(revision 2512)
@@ -22,5 +22,5 @@
 /**
  * This model manages a list of conflicting relation members.
- * 
+ *
  * It can be used as {@see TableModel}.
  *
@@ -39,8 +39,7 @@
     private PropertyChangeSupport support;
 
-
     /**
      * Replies the current number of conflicts
-     * 
+     *
      * @return the current number of conflicts
      */
@@ -52,5 +51,5 @@
      * Updates the current number of conflicts from list of decisions and emits
      * a property change event if necessary.
-     * 
+     *
      */
     protected void updateNumConflicts() {
@@ -120,5 +119,5 @@
      * Populates the model with the members of the relation relation
      * referring to primitive.
-     * 
+     *
      * @param relation the parent relation
      * @param primitive the child primitive
@@ -135,5 +134,5 @@
      * Populates the model with the relation members belonging to one of the relations in relations
      * and referring to one of the primitives in memberPrimitives.
-     * 
+     *
      * @param relations  the parent relations. Empty list assumed if null.
      * @param memberPrimitives the child primitives. Empty list assumed if null.
@@ -155,5 +154,5 @@
      * Populates the model with the relation members represented as a collection of
      * {@see RelationToChildReference}s.
-     * 
+     *
      * @param references the references. Empty list assumed if null.
      */
@@ -175,5 +174,5 @@
     /**
      * Replies the decision at position row
-     * 
+     *
      * @param row
      * @return the decision at position row
@@ -185,5 +184,5 @@
     /**
      * Replies the number of decisions managed by this model
-     * 
+     *
      * @return the number of decisions managed by this model
      */
@@ -195,5 +194,5 @@
      * Refreshes the model state. Invoke this method to trigger necessary change
      * events after an update of the model data.
-     * 
+     *
      */
     public void refresh() {
@@ -204,5 +203,5 @@
     /**
      * Apply a role to all member managed by this model.
-     * 
+     *
      * @param role the role. Empty string assumed if null.
      */
@@ -256,5 +255,5 @@
     /**
      * Builds a collection of commands executing the decisions made in this model.
-     * 
+     *
      * @param newPrimitive the primitive which members shall refer to if the
      * decision is {@see RelationMemberConflictDecisionType#REPLACE}
@@ -295,8 +294,8 @@
      * Replies the set of relations which have to be modified according
      * to the decisions managed by this model.
-     * 
+     *
      * @param newPrimitive the primitive which members shall refer to if the
      * decision is {@see RelationMemberConflictDecisionType#REPLACE}
-     * 
+     *
      * @return the set of relations which have to be modified according
      * to the decisions managed by this model
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolverTable.java	(revision 2512)
@@ -38,5 +38,5 @@
         getActionMap().put("selectNextColumnCell", selectNextColumnCellAction);
         getActionMap().put("selectPreviousColumnCell", selectPreviousColumnCellAction);
-        
+
         setRowHeight((int)new JComboBox().getPreferredSize().getHeight());
     }
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolutionUtil.java	(revision 2512)
@@ -11,5 +11,5 @@
 /**
  * Collection of utility methods for tag conflict resolution
- * 
+ *
  */
 public class TagConflictResolutionUtil {
@@ -18,14 +18,13 @@
     private TagConflictResolutionUtil() {}
 
-
     /**
      * Normalizes the tags in the tag collection tc before resolving tag conflicts.
-     * 
+     *
      *  Removes irrelevant tags like "created_by".
-     * 
+     *
      *  For tags which are not present on at least one of the merged nodes, the empty value ""
      *  is added to the list of values for this tag, but only if there are at least two
      *  primitives with tags.
-     * 
+     *
      * @param tc the tag collection
      * @param merged the collection of merged  primitives
@@ -59,5 +58,5 @@
     /**
      * Combines tags from TIGER data
-     * 
+     *
      * @param tc the tag collection
      */
@@ -75,5 +74,5 @@
      * will offer an option for removing the tag and not only options for selecting
      * one of the current values of the tag.
-     * 
+     *
      * @param tc the tag collection
      */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolver.java	(revision 2512)
@@ -21,5 +21,5 @@
  * This is a UI widget for resolving tag conflicts, i.e. differences of the tag values
  * of multiple {@see OsmPrimitive}s.
- * 
+ *
  *
  */
@@ -61,5 +61,5 @@
     /**
      * Remembers the current settings in the global preferences
-     * 
+     *
      */
     public void rememberPreferences() {
@@ -80,5 +80,5 @@
     /**
      * Replies the model used by this dialog
-     * 
+     *
      * @return the model
      */
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverColumnModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverModel.java	(revision 2512)
@@ -77,5 +77,5 @@
     /**
      * initializes the model from the current tags
-     * 
+     *
      */
     protected void rebuild() {
@@ -105,5 +105,5 @@
     /**
      * Populates the model with the tags for which conflicts are to be resolved.
-     * 
+     *
      * @param tags  the tag collection with the tags. Must not be null.
      * @param keysWithConflicts the set of tag keys with conflicts
@@ -158,5 +158,5 @@
     /**
      * Replies true if each {@see MultiValueResolutionDecision} is decided.
-     * 
+     *
      * @return true if each {@see MultiValueResolutionDecision} is decided; false
      * otherwise
@@ -188,5 +188,5 @@
     /**
      * Sets whether all tags or only tags with conflicts are displayed
-     * 
+     *
      * @param showTagsWithConflictsOnly if true, only tags with conflicts are displayed
      */
@@ -198,5 +198,5 @@
     /**
      * Prepare the default decisions for the current model
-     * 
+     *
      */
     public void prepareDefaultTagDecisions() {
Index: trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/conflict/tags/TagConflictResolverTable.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java	(revision 2512)
@@ -77,5 +77,4 @@
     private OsmDataLayer layer = null;
 
-
     /**
      * builds the GUI
@@ -153,5 +152,4 @@
     }
 
-
     /**
      * refreshes the view of this dialog
@@ -204,5 +202,4 @@
     }
 
-
     /**
      * replies the conflict collection currently held by this dialog; may be null
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java	(revision 2512)
@@ -98,5 +98,4 @@
     }
 
-
     @Override
     public void setVisible(boolean isVisible) {
@@ -153,5 +152,4 @@
     }
 
-
     public ConflictResolutionDialog(Component parent) {
         super(JOptionPane.getFrameForComponent(parent), true /* modal */);
@@ -174,5 +172,4 @@
         }
 
-
         public void actionPerformed(ActionEvent arg0) {
             setVisible(false);
@@ -198,5 +195,5 @@
     /**
      * Action for applying resolved differences in a conflict
-     * 
+     *
      */
     class ApplyResolutionAction extends AbstractAction implements PropertyChangeListener {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java	(revision 2512)
@@ -111,5 +111,5 @@
               });
         pnl.add(upButton);
-        
+
         downButton = new SideButton(marktr("Down"), "down", "SelectionList", tr("Move filter down."),
               new ActionListener(){
@@ -149,5 +149,5 @@
                };
            }
-        };   
+        };
 
         filters.addTableModelListener(this);
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java	(revision 2512)
@@ -52,5 +52,5 @@
  * two actions for (1) (re)loading the history of the selected primitives and (2)
  * for launching a history browser for each selected primitive.
- * 
+ *
  */
 public class HistoryDialog extends ToggleDialog implements HistoryDataSetListener {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java	(revision 2512)
@@ -256,5 +256,4 @@
     }
 
-
     private enum DeleteDecision {
         deleteCurrent,
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java	(revision 2512)
@@ -572,5 +572,4 @@
         Main.contentPane.getActionMap().put("properties:add", addAction);
 
-
         // -- edit action
         //
@@ -886,5 +885,4 @@
     }
 
-
     class AddAction extends AbstractAction {
         public AddAction() {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java	(revision 2512)
@@ -162,5 +162,5 @@
      * Otherwise it is initialized with the list of non-deleted and visible relations
      * in the layer's dataset.
-     * 
+     *
      * @param layer the layer. May be null.
      */
@@ -475,5 +475,5 @@
     /**
      * The action for downloading members of all selected relations
-     * 
+     *
      */
     class DownloadMembersAction extends AbstractAction implements ListSelectionListener{
@@ -557,5 +557,5 @@
          * Add all relations in addedPrimitives to the model for the
          * relation list dialog
-         * 
+         *
          * @param addedPrimitives the collection of added primitives. May include nodes,
          * ways, and relations.
@@ -584,5 +584,5 @@
         /**
          * Removes all relations in removedPrimitives from the model
-         * 
+         *
          * @param removedPrimitives the removed primitives. May include nodes, ways,
          *   and relations
@@ -622,5 +622,5 @@
          * Replies the list of selected, non-new relations. Empty list,
          * if there are no selected, non-new relations.
-         * 
+         *
          * @return the list of selected, non-new relations.
          */
@@ -642,5 +642,5 @@
          * Replies the list of selected relations. Empty list,
          * if there are no selected relations.
-         * 
+         *
          * @return the list of selected, non-new relations.
          */
@@ -658,5 +658,5 @@
         /**
          * Sets the selected relations.
-         * 
+         *
          * @return sel the list of selected relations
          */
@@ -712,5 +712,4 @@
     public void layerRemoved(Layer a) {/* irrelevant in this context */}
     public void layerAdded(Layer a) {/* irrelevant in this context */}
-
 
     /* ---------------------------------------------------------------------------------- */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java	(revision 2512)
@@ -278,5 +278,4 @@
 
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java	(revision 2512)
@@ -237,5 +237,5 @@
      * Action for selecting the primitives contributed by the currently selected
      * users.
-     * 
+     *
      */
     private static class UserInfo implements Comparable {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java	(revision 2512)
@@ -435,5 +435,4 @@
     }
 
-
     /**
      * The asynchronous task for downloading a set of relations
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java	(revision 2512)
@@ -118,5 +118,4 @@
         super(layer, relation, selectedMembers);
 
-
         // initialize the autocompletion infrastructure
         //
@@ -324,5 +323,4 @@
         });
 
-
         JPanel pnl3 = new JPanel();
         pnl3.setLayout(new BorderLayout());
@@ -411,5 +409,4 @@
         memberTable.getSelectionModel().addListSelectionListener(removeSelectedAction);
         pnl.add(new JButton(removeSelectedAction), gc);
-
 
         // ------
@@ -756,5 +753,4 @@
             }
 
-
         }
 
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IMemberModelListener.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IMemberModelListener.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/IMemberModelListener.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberRoleCellEditor.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTable.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableCellRenderer.java	(revision 2512)
@@ -15,5 +15,5 @@
 /**
  * This is the {@see TableCellRenderer} used in the tables of {@see RelationMemberMerger}.
- * 
+ *
  */
 public abstract class MemberTableCellRenderer extends JLabel implements TableCellRenderer {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableColumnModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableLinkedCellRenderer.java	(revision 2512)
@@ -13,5 +13,4 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.gui.dialogs.relation.WayConnectionType.Direction;
-
 
 public class MemberTableLinkedCellRenderer extends MemberTableCellRenderer {
@@ -54,5 +53,4 @@
         int y2 = 0;
 
-
         if (value.linkPrev) {
             g.setColor(Color.black);
@@ -66,5 +64,5 @@
                 g.drawImage(corners,xoff+xloop-2,y1-3,xoff+xloop+1,y1, 2,0,5,3, new Color(0,0,0,0), null);
                 g.drawLine(xoff+3,y1-3,xoff+xloop-3,y1-3);
-            } 
+            }
             else {
                 g.setColor(Color.red);
@@ -86,5 +84,5 @@
                 g.drawImage(corners,xoff+xloop-2,y2+1,xoff+xloop+1,y2+4, 2,2,5,5, new Color(0,0,0,0), null);
                 g.drawLine(xoff+3-1,y2+3,xoff+xloop-3,y2+3);
-            } 
+            }
             else {
                 g.setColor(Color.red);
@@ -118,5 +116,5 @@
         } else if (value.direction == Direction.ROUNDABOUT_RIGHT) {
             g.drawImage(roundabout_right, xoff-6, 1, null);
-        }        
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableMemberCellRenderer.java	(revision 2512)
@@ -23,5 +23,5 @@
     /**
      * Load the image icon for an OSM primitive of type node
-     * 
+     *
      * @return the icon; null, if not found
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableModel.java	(revision 2512)
@@ -406,5 +406,4 @@
         return ret;
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTableRoleCellRenderer.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java	(revision 2512)
@@ -26,5 +26,5 @@
 /**
  * This is an asynchronous task for loading the parents of a given relation.
- * 
+ *
  * Typical usage:
  * 
        @@ -62,10 +62,10 @@
     /**
      * Creates a new task for asynchronously downloading the parents of a child relation.
-     * 
+     *
      * @param child the child relation. Must not be null. Must have an id > 0.
      * @param layer  the OSM data layer. Must not be null.
      * @param full if true, parent relations are fully downloaded (i.e. with their members)
      * @param monitor the progress monitor to be used
-     * 
+     *
      * @exception IllegalArgumentException thrown if child is null
      * @exception IllegalArgumentException thrown if layer is null
@@ -88,5 +88,5 @@
     /**
      * Set a continuation which is called upon the job finished.
-     * 
+     *
      * @param continuation the continuation
      */
@@ -97,5 +97,5 @@
     /**
      * Replies true if this has been cancelled by the user.
-     * 
+     *
      * @return true if this has been cancelled by the user.
      */
@@ -106,5 +106,5 @@
     /**
      * Replies true if an exception has been caught during the execution of this task.
-     * 
+     *
      * @return true if an exception has been caught during the execution of this task.
      */
@@ -112,5 +112,4 @@
         return lastException != null;
     }
-
 
     protected OsmDataLayer getLayer() {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowserModel.java	(revision 2512)
@@ -87,5 +87,4 @@
     }
 
-
     public boolean canReload() {
         return relation != null && !relation.isNew();
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationDialogManager.java	(revision 2512)
@@ -16,5 +16,4 @@
 import org.openstreetmap.josm.gui.layer.Layer.LayerChangeListener;
 
-
 /**
  * RelationDialogManager keeps track of the open relation editors.
@@ -28,5 +27,5 @@
     /**
      * Replies the singleton {@see RelationDialogManager}
-     * 
+     *
      * @return the singleton {@see RelationDialogManager}
      */
@@ -106,5 +105,5 @@
      * Register the relation editor for a relation managed by a
      * {@see OsmDataLayer}.
-     * 
+     *
      * @param layer the layer
      * @param relation the relation
@@ -137,5 +136,5 @@
     /**
      * Closes the editor open for a specific layer and a specific relation.
-     * 
+     *
      * @param layer  the layer
      * @param relation the relation
@@ -152,5 +151,5 @@
      * Replies true if there is an open relation editor for the relation managed
      * by the given layer. Replies false if relation is null.
-     * 
+     *
      * @param layer  the layer
      * @param relation  the relation. May be null.
@@ -168,10 +167,10 @@
      * Replies the editor for the relation managed by layer. Null, if no such editor
      * is currently open. Returns null, if relation is null.
-     * 
+     *
      * @param layer the layer
      * @param relation the relation
      * @return the editor for the relation managed by layer. Null, if no such editor
      * is currently open.
-     * 
+     *
      * @see #isOpenInEditor(OsmDataLayer, Relation)
      */
@@ -184,5 +183,5 @@
     /**
      * called when a layer is removed
-     * 
+     *
      */
     public void layerRemoved(Layer oldLayer) {
@@ -228,5 +227,5 @@
     /**
      * Positions an {@see RelationEditor} centered on the screen
-     * 
+     *
      * @param editor the editor
      */
@@ -244,5 +243,5 @@
      * Replies true, if there is another open {@see RelationEditor} whose
      * upper left corner is close to p.
-     * 
+     *
      * @param p  the reference point to check
      * @return true, if there is another open {@see RelationEditor} whose
@@ -262,5 +261,5 @@
      * Positions a {@see RelationEditor} close to the center of the screen, in such
      * a way, that it doesn't entirely cover another {@see RelationEditor}
-     * 
+     *
      * @param editor
      */
@@ -284,5 +283,5 @@
      * method tries to reposition editor by moving it slightly down and
      * slightly to the right.
-     * 
+     *
      * @param editor the editor
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java	(revision 2512)
@@ -24,5 +24,5 @@
      * {@see #getEditor(OsmDataLayer, Relation, Collection)} will create an instance of
      * this class.
-     * 
+     *
      * @param clazz the class
      */
@@ -55,5 +55,5 @@
      * specific editor has been registered for the type of relation, then
      * a generic editor will be returned.
-     * 
+     *
      * 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
@@ -91,5 +91,5 @@
     /**
      * Creates a new relation editor
-     * 
+     *
      * @param layer  the {@see OsmDataLayer} in whose context a relation is edited. Must not be null.
      * @param relation the relation. Can be null if a new relation is to be edited.
@@ -125,5 +125,5 @@
     /**
      * Replies the currently edited relation
-     * 
+     *
      * @return the currently edited relation
      */
@@ -135,5 +135,5 @@
      * Sets the currently edited relation. Creates a snapshot of the current
      * state of the relation. See {@see #getRelationSnapshot()}
-     * 
+     *
      * @param relation the relation
      */
@@ -147,5 +147,5 @@
      * Replies the {@see OsmDataLayer} in whose context this relation editor is
      * open
-     * 
+     *
      * @return the {@see OsmDataLayer} in whose context this relation editor is
      * open
@@ -157,5 +157,5 @@
     /**
      * Replies the state of the edited relation when the editor has been launched
-     * 
+     *
      * @return the state of the edited relation when the editor has been launched
      */
@@ -166,8 +166,8 @@
     /**
      * Replies true if the currently edited relation has been changed elsewhere.
-     * 
+     *
      * In this case a relation editor can't apply updates to the relation directly. Rather,
      * it has to create a conflict.
-     * 
+     *
      * @return true if the currently edited relation has been changed elsewhere.
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationNodeMap.java	(revision 2512)
@@ -27,5 +27,5 @@
  *
  * @author Christiaan Welvaart 
- * 
+ *
  */
 public class RelationNodeMap {
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTree.java	(revision 2512)
@@ -31,5 +31,5 @@
 /**
  * This is a {@se JTree} rendering the hierarchical structure of {@see Relation}s.
- * 
+ *
  * @see RelationTreeModel
  */
@@ -65,5 +65,5 @@
     /**
      * replies the parent dialog this tree is embedded in.
-     * 
+     *
      * @return the parent dialog; null, if there is no parent dialog
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeCellRenderer.java	(revision 2512)
@@ -42,5 +42,5 @@
     /**
      * renders the textual value. Uses the relations names as value
-     * 
+     *
      * @param relation the relation
      */
@@ -51,5 +51,5 @@
     /**
      * renders the background
-     * 
+     *
      * @param selected true, if the current node is selected
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RelationTreeModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/RunnableAction.java	(revision 2512)
@@ -7,11 +7,11 @@
 public abstract class RunnableAction extends AbstractAction implements Runnable {
 
-	public RunnableAction() {
-	}
+    public RunnableAction() {
+    }
 
-	public abstract void run();
+    public abstract void run();
 
-	public void actionPerformed(ActionEvent arg0) {
-		run();
-	}
+    public void actionPerformed(ActionEvent arg0) {
+        run();
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableCellRenderer.java	(revision 2512)
@@ -20,10 +20,9 @@
 /**
  * This is the {@see TableCellRenderer} used in the tables of {@see RelationMemberMerger}.
- * 
+ *
  */
 public  class SelectionTableCellRenderer extends JLabel implements TableCellRenderer {
     public final static Color BGCOLOR_SELECTED = new Color(143,170,255);
     public final static Color BGCOLOR_DOUBLE_ENTRY = new Color(255,234,213);
-
 
     private HashMap  icons;
@@ -37,5 +36,5 @@
     /**
      * Load the image icon for an OSM primitive of type node
-     * 
+     *
      * @return the icon; null, if not found
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableModel.java	(revision 2512)
@@ -25,5 +25,5 @@
     /**
      * constructor
-     * 
+     *
      * @param layer  the data layer. Must not be null.
      * @exception IllegalArgumentException thrown if layer is null
@@ -38,5 +38,4 @@
         populateSelectedPrimitives(layer);
     }
-
 
     public void unregister() {
@@ -98,5 +97,5 @@
      * populates the model with the primitives currently selected in
      * layer
-     * 
+     *
      * @param layer  the data layer
      */
Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/WayConnectionType.java	(revision 2512)
@@ -15,7 +15,7 @@
     public final boolean linkNext;
 
-    /** 
-     * direction is FORWARD if the first node of this way is connected to the previous way 
-     * and / or the last node of this way is connected to the next way. 
+    /**
+     * direction is FORWARD if the first node of this way is connected to the previous way
+     * and / or the last node of this way is connected to the next way.
      * direction is BACKWARD if it is the other way around.
      * direction has a ROUNDABOUT value, if it is tagged as such and it is somehow
@@ -25,11 +25,11 @@
      */
     public final Direction direction;
-    
+
     public enum Direction {
         FORWARD, BACKWARD, ROUNDABOUT_LEFT, ROUNDABOUT_RIGHT, NONE;
-        
+
         public boolean isRoundabout() {
             return this == ROUNDABOUT_RIGHT || this == ROUNDABOUT_LEFT;
-        }    
+        }
     };
 
@@ -38,5 +38,5 @@
 
     public boolean isRoundabout = false;
-    
+
     public WayConnectionType(boolean linkPrev, boolean linkNext, Direction direction) {
         this.linkPrev = linkPrev;
@@ -55,7 +55,7 @@
         invalid = true;
     }
-    
+
     public boolean isValid() {
-        return !invalid;    
+        return !invalid;
     }
 
Index: trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java	(revision 2512)
@@ -43,16 +43,16 @@
     /** the list of bookmarks */
     private BookmarkList bookmarks;
-    
+
     /** the parent download GUI */
     private DownloadDialog parent;
-    
+
     /** displays information about the current download area */
     private JMultilineLabel lblCurrentDownloadArea;
     /** the add action */
     private AddAction actAdd;
-    
+
     /**
-     * Creates the panel with the action buttons on the left 
-     * 
+     * Creates the panel with the action buttons on the left
+     *
      * @return the panel with the action buttons on the left
      */
@@ -78,9 +78,9 @@
         return pnl;
     }
-    
+
     protected JPanel buildDownloadAreaAddPanel() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
-        
+
         GridBagConstraints  gc = new GridBagConstraints();
         gc.anchor = GridBagConstraints.NORTHWEST;
@@ -89,7 +89,7 @@
         gc.weighty = 1.0;
         gc.insets = new Insets(5,5,5,5);
-        
+
         pnl.add(lblCurrentDownloadArea = new JMultilineLabel(""), gc);
-        
+
         gc.anchor = GridBagConstraints.NORTHEAST;
         gc.fill = GridBagConstraints.HORIZONTAL;
@@ -100,11 +100,10 @@
         return pnl;
     }
- 
+
     public void addGui(final DownloadDialog gui) {
         JPanel dlg = new JPanel(new GridBagLayout());
         gui.addDownloadAreaSelector(dlg, tr("Bookmarks"));
         GridBagConstraints gc = new GridBagConstraints();
-     
-        
+
         bookmarks = new BookmarkList();
         bookmarks.getSelectionModel().addListSelectionListener(new ListSelectionListener() {
@@ -117,11 +116,11 @@
         });
         bookmarks.addMouseListener(new DoubleClickAdapter());
-        
+
         gc.fill = GridBagConstraints.HORIZONTAL;
         gc.weightx = 1.0;
-        gc.weighty = 0.0;        
+        gc.weighty = 0.0;
         gc.gridwidth = 2;
         dlg.add(buildDownloadAreaAddPanel(),gc);
-                
+
         gc.gridwidth = 1;
         gc.gridx = 0;
@@ -129,5 +128,5 @@
         gc.fill = GridBagConstraints.VERTICAL;
         gc.weightx = 0.0;
-        gc.weighty = 1.0;        
+        gc.weighty = 1.0;
         dlg.add(buildButtonPanel(),gc);
 
@@ -137,11 +136,11 @@
         gc.fill = GridBagConstraints.BOTH;
         gc.weightx = 1.0;
-        gc.weighty = 1.0;   
+        gc.weighty = 1.0;
         gc.gridx = 1;
-        dlg.add(new JScrollPane(bookmarks), gc);       
-        
+        dlg.add(new JScrollPane(bookmarks), gc);
+
         this.parent = gui;
     }
-    
+
     protected void updateDownloadAreaLabel() {
         if (currentArea == null) {
@@ -154,12 +153,12 @@
                     currentArea.getMax().lonToString(CoordinateFormat.DECIMAL_DEGREES)
                     )
-            );                   
-        }
-    }
-    
+            );
+        }
+    }
+
     /**
-     * Sets the current download area 
-     * 
-     * @param area the download area. 
+     * Sets the current download area
+     *
+     * @param area the download area.
      */
     public void setDownloadArea(Bounds area) {
@@ -170,5 +169,5 @@
         actAdd.setEnabled(area != null);
     }
-    
+
     /**
      * The action to add a new bookmark for the current download area.
@@ -181,5 +180,5 @@
             putValue(SHORT_DESCRIPTION, tr("Add a bookmark for the currently selected download area"));
         }
-        
+
         public void actionPerformed(ActionEvent e) {
             if (currentArea == null) {
@@ -203,8 +202,8 @@
                 ((DefaultListModel)bookmarks.getModel()).addElement(b);
                 bookmarks.save();
-            }            
-        }
-    }
-    
+            }
+        }
+    }
+
     class RemoveAction extends AbstractAction implements ListSelectionListener{
         public RemoveAction() {
@@ -214,5 +213,5 @@
             updateEnabledState();
         }
-        
+
         public void actionPerformed(ActionEvent e) {
             Object[] sels = bookmarks.getSelectedValues();
@@ -230,7 +229,7 @@
         public void valueChanged(ListSelectionEvent e) {
             updateEnabledState();
-        }       
-    }
-    
+        }
+    }
+
     class RenameAction extends AbstractAction implements ListSelectionListener{
         public RenameAction() {
@@ -240,5 +239,5 @@
             updateEnabledState();
         }
-        
+
         public void actionPerformed(ActionEvent e) {
             Object[] sels = bookmarks.getSelectedValues();
@@ -247,5 +246,5 @@
             }
             Bookmark b = (Bookmark)sels[0];
-            Object value = 
+            Object value =
                     JOptionPane.showInputDialog(
                     Main.parent,tr("Please enter a name for the bookmarked download area."),
@@ -257,5 +256,5 @@
                     );
             if (value != null) {
-                b.setName(value.toString());            
+                b.setName(value.toString());
                 bookmarks.save();
                 bookmarks.repaint();
@@ -267,11 +266,11 @@
         public void valueChanged(ListSelectionEvent e) {
             updateEnabledState();
-        }       
-    }
-    
+        }
+    }
+
     class DoubleClickAdapter extends MouseAdapter {
         @Override
         public void mouseClicked(MouseEvent e) {
-            if (!(SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2)) 
+            if (!(SwingUtilities.isLeftMouseButton(e) && e.getClickCount() == 2))
                 return;
             int idx = bookmarks.locationToIndex(e.getPoint());
@@ -279,6 +278,6 @@
                 return;
             Bookmark b = (Bookmark)bookmarks.getModel().getElementAt(idx);
-            parent.startDownload(b.getArea());            
-        }       
-    }   
+            parent.startDownload(b.getArea());
+        }
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java	(revision 2512)
@@ -55,5 +55,4 @@
     private DownloadDialog parent;
 
-
     protected void registerBoundingBoxBuilder() {
         BoundingBoxBuilder bboxbuilder = new BoundingBoxBuilder();
@@ -148,5 +147,4 @@
     }
 
-
     public void setDownloadArea(Bounds area) {
         updateBboxFields(area);
@@ -207,5 +205,4 @@
     }
 
-
     class LatValueChecker extends FocusAdapter implements ActionListener{
         private JTextField tfLatValue;
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java	(revision 2512)
@@ -48,15 +48,15 @@
 
 /**
- * 
+ *
  */
 public class DownloadDialog extends JDialog  {
     static private final Logger logger = Logger.getLogger(DownloadDialog.class.getName());
-    
+
     /** the unique instance of the download dialog */
     static private DownloadDialog instance;
-        
+
     /**
      * Replies the unique instance of the download dialog
-     * 
+     *
      * @return the unique instance of the download dialog
      */
@@ -65,5 +65,5 @@
             instance = new DownloadDialog(Main.parent);
         return instance;
-    }    
+    }
 
     private final List downloadSelections = new ArrayList();
@@ -80,7 +80,6 @@
     private SideButton btnDownload;
 
-    
     public JPanel buildMainPanel() {
-        JPanel pnl = new JPanel(); 
+        JPanel pnl = new JPanel();
         pnl.setLayout(new GridBagLayout());
         pnl.setBorder(BorderFactory.createEmptyBorder(10,10,10,10));
@@ -94,5 +93,5 @@
         cbDownloadGpxData.setToolTipText(tr("Select to download GPS traces in the selected download area."));
         pnl.add(cbDownloadGpxData,  GBC.eol().insets(20,0,0,0));
-        
+
         // predefined download selections
         downloadSelections.add(new SlippyMapChooser());
@@ -111,5 +110,5 @@
             s.addGui(this);
         }
-   
+
         cbNewLayer = new JCheckBox(tr("Download as new layer"));
         cbNewLayer.setToolTipText(tr("Select to download data into a new data layer.
        "
@@ -131,9 +130,9 @@
         return pnl;
     }
-    
+
     protected JPanel buildButtonPanel() {
         JPanel pnl = new JPanel();
         pnl.setLayout(new FlowLayout());
-        
+
         // -- download button
         pnl.add(btnDownload = new SideButton(actDownload = new DownloadAction()));
@@ -142,5 +141,5 @@
         btnDownload.getActionMap().put("download",actDownload);
 
-        // -- cancel button         
+        // -- cancel button
         SideButton btnCancel;
         CancelAction actCancel = new CancelAction();
@@ -150,9 +149,9 @@
         btnCancel.getActionMap().put("enter",actCancel);
 
-        // -- cancel on ESC 
+        // -- cancel on ESC
         getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE,0), "cancel");
         getRootPane().getActionMap().put("cancel", actCancel);
 
-        // -- help button 
+        // -- help button
         SideButton btnHelp;
         pnl.add(btnHelp = new SideButton(new ContextSensitiveHelpAction(ht("/Dialog/DownloadDialog"))));
@@ -160,8 +159,8 @@
         btnHelp.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER,0), "enter");
         btnHelp.getActionMap().put("enter",btnHelp.getAction());
-        
-        return pnl;        
-    }
-    
+
+        return pnl;
+    }
+
     public DownloadDialog(Component parent) {
         super(JOptionPane.getFrameForComponent(parent),tr("Download"), true /* modal */);
@@ -169,5 +168,5 @@
         getContentPane().add(buildMainPanel(), BorderLayout.CENTER);
         getContentPane().add(buildButtonPanel(), BorderLayout.SOUTH);
-        
+
         getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
                 KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
@@ -182,5 +181,4 @@
         restoreSettings();
     }
-    
 
     private void checkClipboardContents() {
@@ -224,5 +222,5 @@
      * @param eventSource - the DownloadSelection object that fired this notification.
      */
-    public void boundingBoxChanged(Bounds b, DownloadSelection eventSource) {        
+    public void boundingBoxChanged(Bounds b, DownloadSelection eventSource) {
         this.currentBounds = b;
         for (DownloadSelection s : downloadSelections) {
@@ -233,7 +231,7 @@
         updateSizeCheck();
     }
-    
-    /**
-     * Invoked by 
+
+    /**
+     * Invoked by
      * @param b
      */
@@ -242,8 +240,8 @@
         actDownload.run();
     }
-    
+
     /**
      * Replies true if the user selected to download OSM data
-     * 
+     *
      * @return true if the user selected to download OSM data
      */
@@ -251,8 +249,8 @@
         return cbDownloadOsmData.isSelected();
     }
-    
+
     /**
      * Replies true if the user selected to download GPX data
-     * 
+     *
      * @return true if the user selected to download GPX data
      */
@@ -260,18 +258,18 @@
         return cbDownloadGpxData.isSelected();
     }
-    
-    /**
-     * Replies true if the user requires to download into a new layer 
-     * 
-     * @return true if the user requires to download into a new layer 
+
+    /**
+     * Replies true if the user requires to download into a new layer
+     *
+     * @return true if the user requires to download into a new layer
      */
     public boolean isNewLayerRequired() {
         return cbNewLayer.isSelected();
     }
-    
+
     /**
      * Adds a new download area selector to the download dialog
-     * 
-     * @param selector the download are selector 
+     *
+     * @param selector the download are selector
      * @param displayName the display name of the selector
      */
@@ -279,8 +277,8 @@
         tpDownloadAreaSelectors.add(displayName, selector);
     }
-    
-    /**
-     * Remembers the current settings in the download dialog 
-     * 
+
+    /**
+     * Remembers the current settings in the download dialog
+     *
      */
     public void rememberSettings() {
@@ -293,5 +291,5 @@
         }
     }
-    
+
     public void restoreSettings() {
         cbDownloadOsmData.setSelected(Main.pref.getBoolean("download.osm", true));
@@ -303,10 +301,10 @@
         }
         tpDownloadAreaSelectors.setSelectedIndex(idx);
-        
+
         if (Main.map != null) {
             MapView mv = Main.map.mapView;
             currentBounds = new Bounds(
                     mv.getLatLon(0, mv.getHeight()),
-                    mv.getLatLon(mv.getWidth(), 0)                    
+                    mv.getLatLon(mv.getWidth(), 0)
                     );
             boundingBoxChanged(currentBounds,null);
@@ -323,5 +321,5 @@
         }
     }
-    
+
     /**
      * Replies the currently selected download area. May be null, if no download area is selected
@@ -331,5 +329,5 @@
         return currentBounds;
     }
-    
+
     @Override
     public void setVisible(boolean visible) {
@@ -350,5 +348,5 @@
     /**
      * Replies true if the dialog was canceled
-     * 
+     *
      * @return true if the dialog was canceled
      */
@@ -360,20 +358,20 @@
         this.canceled = canceled;
     }
-    
+
     class CancelAction extends AbstractAction {
         public CancelAction() {
             putValue(NAME, tr("Cancel"));
             putValue(SMALL_ICON, ImageProvider.get("cancel"));
-            putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and to abort downloading"));            
-        }
-       
+            putValue(SHORT_DESCRIPTION, tr("Click to close the dialog and to abort downloading"));
+        }
+
         public void run() {
             setCanceled(true);
-            setVisible(false);    
-        }
-        
+            setVisible(false);
+        }
+
         public void actionPerformed(ActionEvent e) {
             run();
-        }       
+        }
     }
 
@@ -382,7 +380,7 @@
             putValue(NAME, tr("Download"));
             putValue(SMALL_ICON, ImageProvider.get("download"));
-            putValue(SHORT_DESCRIPTION, tr("Click do download the currently selected area"));            
-        }
-        
+            putValue(SHORT_DESCRIPTION, tr("Click do download the currently selected area"));
+        }
+
         public void run() {
             if (currentBounds == null) {
@@ -398,5 +396,5 @@
                 JOptionPane.showMessageDialog(
                         DownloadDialog.this,
-                        tr("Neither {0} nor {1} is enabled.
        " 
+                        tr("Neither {0} nor {1} is enabled.
        "
                                 + "Please chose to either download OSM data, or GPX data, or both.",
                         cbDownloadOsmData.getText(),
@@ -409,12 +407,12 @@
             }
             setCanceled(false);
-            setVisible(false);  
-        }
-        
+            setVisible(false);
+        }
+
         public void actionPerformed(ActionEvent e) {
             run();
-        }       
-    }
-    
+        }
+    }
+
     class WindowEventHandler extends WindowAdapter {
         @Override
@@ -426,5 +424,5 @@
         public void windowActivated(WindowEvent e) {
             btnDownload.requestFocusInWindow();
-        }        
+        }
     }
 }
Index: trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/DownloadSelection.java	(revision 2512)
@@ -3,5 +3,4 @@
 
 import org.openstreetmap.josm.data.Bounds;
-
 
 public interface DownloadSelection  {
@@ -12,12 +11,10 @@
     void addGui(DownloadDialog gui);
 
-    
     /**
      * Sets the current download area. The area may be null to clear
      * the current download area.
-     * 
+     *
      * @param are the current download area
      */
     public void setDownloadArea(Bounds area);
 }
-
Index: trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java	(revision 2512)
@@ -66,11 +66,11 @@
     private JTable tblSearchResults;
     private DownloadDialog parent;
-  
+
     protected JPanel buildSearchPanel() {
         JPanel panel = new JPanel();
         panel.setLayout(new GridBagLayout());
         GridBagConstraints gc = new GridBagConstraints();
-        
-        // the label for the search field 
+
+        // the label for the search field
         //
         gc.gridwidth = 2;
@@ -79,5 +79,5 @@
         gc.insets = new Insets(5, 5, 0, 5);
         panel.add(new JLabel(tr("Enter a place name to search for:")), gc);
-        
+
         // the search expression field
         //
@@ -104,6 +104,6 @@
         gc.weightx = 0.0;
         panel.add(btnSearch,  gc);
-   
-        return panel;   
+
+        return panel;
     }
 
@@ -125,8 +125,8 @@
         scrollPane.setPreferredSize(new Dimension(200,200));
         panel.add(scrollPane, BorderLayout.CENTER);
-        
+
         gui.addDownloadAreaSelector(panel, tr("Areas around places"));
 
-        scrollPane.setPreferredSize(scrollPane.getPreferredSize());        
+        scrollPane.setPreferredSize(scrollPane.getPreferredSize());
         tblSearchResults.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
         tblSearchResults.getSelectionModel().addListSelectionListener(new ListSelectionHandler());
@@ -139,5 +139,5 @@
                 }
             }
-        });        
+        });
         parent = gui;
     }
@@ -146,5 +146,5 @@
        tblSearchResults.clearSelection();
     }
-        
+
     /**
      * Data storage for search results.
@@ -160,9 +160,9 @@
         public int osmId;
         public OsmPrimitiveType type;
-        
+
         public Bounds getDownloadArea() {
             double size = 180.0 / Math.pow(2, zoom);
             Bounds b = new Bounds(
-                    new LatLon(lat - size / 2, lon - size), 
+                    new LatLon(lat - size / 2, lon - size),
                     new LatLon(lat + size / 2, lon+ size)
                     );
@@ -170,6 +170,5 @@
         }
     }
-    
-    
+
     /**
      * A very primitive parser for the name finder's output.
@@ -185,5 +184,5 @@
         /**
          * Detect starting elements.
-         * 
+         *
          */
         @Override
@@ -245,10 +244,10 @@
             }
         }
-        
+
         public List getResult() {
             return data;
         }
     }
-    
+
     class SearchAction extends AbstractAction implements DocumentListener {
 
@@ -259,5 +258,5 @@
             updateEnabledState();
         }
-        
+
         public void actionPerformed(ActionEvent e) {
             if (!isEnabled() || cbSearchExpression.getText().trim().length() == 0)
@@ -268,5 +267,5 @@
             Main.worker.submit(task);
         }
-        
+
         protected void updateEnabledState() {
             setEnabled(cbSearchExpression.getText().trim().length() > 0);
@@ -285,8 +284,7 @@
         }
     }
-    
-    
+
     class NameQueryTask extends PleaseWaitRunnable {
-        
+
         private String searchExpression;
         private HttpURLConnection connection;
@@ -294,11 +292,10 @@
         private boolean canceled = false;
         private Exception lastException;
-        
+
         public NameQueryTask(String searchExpression) {
             super(tr("Querying name server"),false /* don't ignore exceptions */);
             this.searchExpression = searchExpression;
         }
-        
-        
+
         @Override
         protected void cancel() {
@@ -306,12 +303,12 @@
             synchronized (this) {
                 if (connection != null) {
-                    connection.disconnect();                    
-                }                
-            }            
+                    connection.disconnect();
+                }
+            }
         }
 
         @Override
         protected void finish() {
-            if (canceled) 
+            if (canceled)
                 return;
             if (lastException != null) {
@@ -319,9 +316,9 @@
                 return;
             }
-            model.setData(this.data);            
-        }
-
-        @Override
-        protected void realRun() throws SAXException, IOException, OsmTransferException {            
+            model.setData(this.data);
+        }
+
+        @Override
+        protected void realRun() throws SAXException, IOException, OsmTransferException {
             try {
                 getProgressMonitor().indeterminateSubTask(tr("Querying name server ..."));
@@ -339,5 +336,5 @@
             } catch(Exception e) {
                 if (canceled) {
-                    // ignore exception 
+                    // ignore exception
                     return;
                 }
@@ -346,9 +343,9 @@
         }
     }
-    
+
     class NamedResultTableModel extends DefaultTableModel {
         private ArrayList data;
         private ListSelectionModel selectionModel;
-        
+
         public NamedResultTableModel(ListSelectionModel selectionModel) {
             data = new ArrayList();
@@ -366,5 +363,5 @@
             return data.get(row);
         }
-        
+
         public void setData(List data) {
             if (data == null) {
@@ -377,7 +374,7 @@
         @Override
         public boolean isCellEditable(int row, int column) {
-            return false; 
-        }
-        
+            return false;
+        }
+
         public SearchResult getSelectedSearchResult() {
             if (selectionModel.getMinSelectionIndex() < 0) {
@@ -387,5 +384,5 @@
         }
     }
-    
+
     class NamedResultTableColumnModel extends DefaultTableColumnModel {
         protected void createColumns() {
@@ -400,5 +397,5 @@
             col.setCellRenderer(renderer);
             addColumn(col);
-            
+
             // column 1 - Version
             col = new TableColumn(1);
@@ -408,5 +405,5 @@
             col.setCellRenderer(renderer);
             addColumn(col);
-            
+
             // column 2 - Near
             col = new TableColumn(2);
@@ -416,5 +413,4 @@
             col.setCellRenderer(renderer);
             addColumn(col);
-            
 
             // column 3 - Zoom
@@ -431,5 +427,5 @@
         }
     }
-    
+
     class ListSelectionHandler implements ListSelectionListener {
         public void valueChanged(ListSelectionEvent lse) {
@@ -445,17 +441,17 @@
         }
     }
-    
+
     class NamedResultCellRenderer extends JLabel implements TableCellRenderer {
-        
+
         public NamedResultCellRenderer() {
             setOpaque(true);
             setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
         }
-        
+
         protected void reset() {
             setText("");
             setIcon(null);
         }
-        
+
         protected void renderColor(boolean selected) {
             if (selected) {
@@ -464,8 +460,8 @@
             } else {
                 setForeground(UIManager.getColor("Table.foreground"));
-                setBackground(UIManager.getColor("Table.background"));                
-            }
-        }
-        
+                setBackground(UIManager.getColor("Table.background"));
+            }
+        }
+
         protected String lineWrapDescription(String description) {
             StringBuffer ret = new StringBuffer();
@@ -488,11 +484,11 @@
             return ret.toString();
         }
-        
+
         public Component getTableCellRendererComponent(JTable table, Object value,
                 boolean isSelected, boolean hasFocus, int row, int column) {
-            
+
             reset();
             renderColor(isSelected);
-            
+
             if (value == null) return this;
             SearchResult sr = (SearchResult) value;
Index: trunk/src/org/openstreetmap/josm/gui/download/SizeButton.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/SizeButton.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/SizeButton.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. Copyright 2007 by Tim Haussmann
 package org.openstreetmap.josm.gui.download;
-
 
 import java.awt.Graphics;
@@ -9,5 +8,4 @@
 
 import org.openstreetmap.josm.tools.ImageProvider;
-
 
 /**
@@ -22,5 +20,4 @@
     private ImageIcon shrinkImage;
     private boolean isEnlarged = false;
-
 
     public SizeButton(){
Index: trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java	(revision 2512)
@@ -122,5 +122,5 @@
         String labelText = tr("Zoom: Mousewheel, double click or Ctrl + Up/Down "
                 + "Move map: Hold right mousebutton and move mouse or use cursor keys. Select: Hold left mousebutton and draw a frame.");
-        slipyyMapTabPanel.add(new JLabel("" + labelText + ""), BorderLayout.SOUTH);        
+        slipyyMapTabPanel.add(new JLabel("" + labelText + ""), BorderLayout.SOUTH);
         iGui.addDownloadAreaSelector(slipyyMapTabPanel, tr("Slippy map"));
         new OsmMapControl(this, slipyyMapTabPanel, iSizeButton, iSourceButton);
@@ -169,5 +169,5 @@
         if (area == null)
             return;
-        
+
         // test if a bounding box has been set set
         if (area.getMin().lat() == 0.0 && area.getMin().lon() == 0.0 && area.getMax().lat() == 0.0 && area.getMax().lon() == 0.0)
@@ -224,9 +224,9 @@
         Bounds b = new Bounds(
                 new LatLon(
-                        Math.min(l2.getLat(), l1.getLat()), 
+                        Math.min(l2.getLat(), l1.getLat()),
                         Math.min(l1.getLon(), l2.getLon())
                         ),
                 new LatLon(
-                        Math.max(l2.getLat(), l1.getLat()), 
+                        Math.max(l2.getLat(), l1.getLat()),
                         Math.max(l1.getLon(), l2.getLon()))
                 );
Index: trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/ContextSensitiveHelpAction.java	(revision 2512)
@@ -13,5 +13,5 @@
  * This is the standard help action to be used with help buttons for
  * context sensitive help
- * 
+ *
  */
 public class ContextSensitiveHelpAction extends AbstractAction {
@@ -21,6 +21,6 @@
 
     /**
-     * Sets the help topic 
-     * 
+     * Sets the help topic
+     *
      * @param relativeHelpTopic the relative help topic
      */
@@ -30,15 +30,15 @@
         this.helpTopic = relativeHelpTopic;
     }
-    
+
     /**
      * Creates a help topic for the root help topic
-     * 
+     *
      */
     public ContextSensitiveHelpAction() {
         this(ht("/"));
     }
-    
+
     /**
-     * 
+     *
      * @param helpTopic
      */
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpApplication.java	(revision 2512)
@@ -31,5 +31,5 @@
  * The JOSM help browser wrapped in its own application. It is listening to commands
  * on standard in.
- * 
+ *
  */
 public class HelpApplication {
@@ -57,5 +57,4 @@
         new Thread(commandProcessor).start();
     }
-
 
     static public void main(String argArray[]) {
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowser.java	(revision 2512)
@@ -57,5 +57,5 @@
     /**
      * Replies the unique instance of the help browser
-     * 
+     *
      * @return the unique instance of the help browser
      */
@@ -70,5 +70,5 @@
      * Launches the internal help browser and directs it to the help page for
      * helpTopic.
-     * 
+     *
      * @param helpTopic the help topic
      */
@@ -94,5 +94,5 @@
     /**
      * Builds the style sheet used in the internal help browser
-     * 
+     *
      * @return the style sheet
      */
@@ -172,8 +172,7 @@
     /**
      * Replies the current URL
-     * 
+     *
      * @return the current URL
      */
-
 
     public String getUrl() {
@@ -183,5 +182,5 @@
     /**
      * Displays a warning page when a help topic doesn't exist yet.
-     * 
+     *
      * @param relativeHelpTopic the help topic
      */
@@ -204,5 +203,5 @@
     /**
      * Displays a error page if a help topic couldn't be loaded because of network or IO error.
-     * 
+     *
      * @param relativeHelpTopic the help topic
      * @param e the exception
@@ -227,8 +226,8 @@
     /**
      * Loads a help topic given by a relative help topic name (i.e. "/Action/New")
-     * 
+     *
      * First tries to load the language specific help topic. If it is missing, tries to
      * load the topic in english.
-     * 
+     *
      * @param relativeHelpTopic the relative help topic
      */
@@ -265,5 +264,5 @@
      * Loads a help topic given by an absolute help topic name, i.e.
      * "/De:Help/Action/New"
-     * 
+     *
      * @param absoluteHelpTopic the absolute help topic name
      */
@@ -289,8 +288,8 @@
     /**
      * Opens an URL and displays the content.
-     * 
+     *
      *  If the URL is the locator of an absolute help topic, help content is loaded from
      *  the JOSM wiki. Otherwise, the help browser loads the page from the given URL
-     * 
+     *
      * @param url the url
      */
@@ -333,5 +332,5 @@
      * Loads and displays the help information for a help topic given
      * by a relative help topic name, i.e. "/Action/New"
-     * 
+     *
      * @param relativeHelpTopic the relative help topic
      */
@@ -455,5 +454,5 @@
         /**
          * Scrolls the help browser to the element with id id
-         * 
+         *
          * @param id the id
          * @return true, if an element with this id was found and scrolling was successful; false, otherwise
@@ -485,7 +484,7 @@
          * . If so, replies the fragment, i.e.
          * "thisIsALocalFragment".
-         * 
+         *
          * Otherwise, replies null
-         * 
+         *
          * @param e the hyperlink event
          * @return the local fragment
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserCommandProcessor.java	(revision 2512)
@@ -13,5 +13,5 @@
 /**
  * Listens to commands on an input stream and delegates them to the help browser.
- * 
+ *
  *
  */
@@ -23,5 +23,5 @@
 
     /**
-     * 
+     *
      * @param browser the controlled help browser
      */
@@ -32,5 +32,5 @@
     /**
      * Show the help page for help topic helpTopic.
-     * 
+     *
      * @param helpTopic the help topic
      */
@@ -83,3 +83,2 @@
     }
 }
-
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserHistory.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpBrowserProxy.java	(revision 2512)
@@ -15,5 +15,5 @@
 /**
  * This is the proxy class for the help browser running in its own process.
- * 
+ *
  *
  */
@@ -25,5 +25,5 @@
     /**
      * replies the unique instance of the proxy
-     * 
+     *
      * @return the unique instance of the proxy
      */
@@ -42,5 +42,5 @@
     /**
      * launches the help browser in its own process
-     * 
+     *
      */
     protected void launch() {
@@ -78,5 +78,5 @@
      * Direct the help browser to the help page for help topic
      * relativeHelpTopic
-     * 
+     *
      * @param relativeHelpTopic the help topic
      */
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpContentReader.java	(revision 2512)
@@ -14,11 +14,11 @@
  * Reads help content from the JOSM Wiki and prepares it for rendering in the internal
  * help browser.
- * 
+ *
  * The help content has to be filtered because only the main content <div>
  * of a Wiki help page is displayed in the internal help browser.
- * 
+ *
  * It also has to be transformed because the internal help browser required slightly
  * different HTML than what is provided by the Wiki.
- * 
+ *
  * @see WikiReader
  */
@@ -30,5 +30,5 @@
     /**
      * constructor
-     * 
+     *
      * @param baseUrl the base url of the JOSM help wiki, i.e. http://josm.openstreetmap.org
      */
@@ -39,5 +39,5 @@
     /**
      * Fetches the content of a help topic from the JOSM wiki.
-     * 
+     *
      * @param helpTopicUrl  the absolute help topic URL
      * @return the content, filtered and transformed for being displayed in the internal help browser
@@ -81,8 +81,8 @@
      * Reads help content from the input stream and prepares it to be rendered later
      * in the internal help browser.
-     * 
+     *
      * Throws a {@see MissingHelpContentException} if the content read from the stream
      * most likely represents a stub help page.
-     * 
+     *
      * @param in the input stream
      * @return the content
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpContentReaderException.java	(revision 2512)
@@ -28,5 +28,5 @@
      * Replies the HTTP response code related to the wiki access exception.
      * If no HTTP response code is available, 0 is replied.
-     * 
+     *
      * @return the http response code
      */
@@ -37,5 +37,5 @@
     /**
      * Sets the HTTP response code
-     * 
+     *
      * @param responseCode the response code
      */
@@ -44,4 +44,3 @@
     }
 
-
 }
Index: trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/HelpUtil.java	(revision 2512)
@@ -19,5 +19,5 @@
     /**
      * Replies the base wiki URL.
-     * 
+     *
      * @return the base wiki URL
      */
@@ -28,5 +28,5 @@
     /**
      * Replies the base wiki URL for help pages
-     * 
+     *
      * @return the base wiki URL for help pages
      */
@@ -37,5 +37,5 @@
     /**
      * Replies the URL on the wiki for an absolute help topic. The URL is encoded in UTF-8.
-     * 
+     *
      * @param absoluteHelpTopic the absolute help topic
      * @return the url
@@ -53,5 +53,5 @@
     /**
      * Replies the URL to the edit page for the absolute help topic.
-     * 
+     *
      * @param absoluteHelpTopic the absolute help topic
      * @return the URL to the edit page
@@ -66,5 +66,5 @@
      * Extracts the relative help topic from an URL. Replies null, if
      * no relative help topic is found.
-     * 
+     *
      * @param url the url
      * @return the relative help topic in the URL, i.e. "/Action/New"
@@ -82,5 +82,5 @@
      * Extracts the absolute help topic from an URL. Replies null, if
      * no absolute help topic is found.
-     * 
+     *
      * @param url the url
      * @return the absolute help topic in the URL, i.e. "/De:Help/Action/New"
@@ -106,5 +106,5 @@
      *   
      • /De:Help if the current locale is a locale with language "de"
        • 
      * 
      
-     * 
+     *
      * @return the help topic prefix
      * @see #getHelpTopicPrefix(Locale)
@@ -120,5 +120,5 @@
      *   
    1. /De:Help if the  locale is a locale with language "de"
      2. 
      * 
-     * 
+     *
      * @param locale the locale. {@see Locale#ENGLISH} assumed, if null.
      * @return the help topic prefix
@@ -137,8 +137,8 @@
     /**
      * Replies the absolute, localized help topic for the given topic.
-     * 
+     *
      * Example: for a topic "/Dialog/RelationEditor" and the locale "de", this method
      * replies "/De:Help/Dialog/RelationEditor"
-     * 
+     *
      * @param topic the relative help topic. Home help topic assumed, if null.
      * @param locale the locale. {@see Locale#ENGLISH} assumed, if null.
@@ -164,5 +164,5 @@
      * Replies the absolute, localized help topic for the given topic and the
      * current locale.
-     * 
+     *
      * @param topic the relative help topic. Home help topic assumed, if null.
      * @return the absolute, localized help topic
@@ -176,5 +176,5 @@
     /**
      * Replies the context specific help topic configured for context.
-     * 
+     *
      * @return the help topic. null, if no context specific help topic is found
      */
@@ -208,5 +208,5 @@
      * Replies the global help action, if available. Otherwise, creates an instance
      * of {@see HelpAction}.
-     * 
+     *
      * @return
      */
@@ -221,9 +221,9 @@
     /**
      * Makes a component aware of context sensitive help.
-     * 
+     *
      * A relative help topic doesn't start with /Help and doesn't include a locale
      * code. Example: /Dialog/RelationEditor is a relative help topic, /De:Help/Dialog/RelationEditor
      * is not.
-     * 
+     *
      * @param component the component  the component
      * @param topic the help topic. Set to the default help topic if null.
@@ -241,5 +241,5 @@
      * This is a simple marker method for help topic literals. If you declare a help
      * topic literal in the source you should enclose it in ht(...).
-     * 
+     *
      *  Example
      *  
      @@ -248,6 +248,6 @@
      *     putValue("help", ht("/Dialog/RelationEditor"));
      *  
      
-     * 
-     * 
+     *
+     *
      * @param helpTopic
      */
Index: trunk/src/org/openstreetmap/josm/gui/help/Helpful.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/Helpful.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/Helpful.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/help/MissingHelpContentException.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/AdjustmentSynchronizer.java	(revision 2512)
@@ -15,5 +15,4 @@
 
 import javax.swing.JCheckBox;
-
 
 /**
@@ -36,5 +35,4 @@
         observable = new Observable();
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/CoordinateInfoViewer.java	(revision 2512)
@@ -87,5 +87,5 @@
 
     /**
-     * 
+     *
      * @param model the model. Must not be null.
      * @throws IllegalArgumentException thrown if model is null
@@ -131,5 +131,5 @@
     /**
      * Sets the model for this viewer
-     * 
+     *
      * @param model the model.
      */
@@ -147,5 +147,5 @@
      * A UI widgets which displays the Lan/Lon-coordinates of a
      * {@see HistoryNode}.
-     * 
+     *
      */
     private static class LatLonViewer extends JPanel implements Observer{
@@ -210,5 +210,4 @@
             lblLon.setBorder(BorderFactory.createEmptyBorder(2,2,2,2));
 
-
             // fill the remaining space
             gc.gridx = 0;
@@ -222,5 +221,5 @@
 
         /**
-         * 
+         *
          * @param model a model
          * @param role the role for this viewer.
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java	(revision 2512)
@@ -30,5 +30,4 @@
     private CoordinateInfoViewer coordinateInfoViewer;
     private JTabbedPane tpViewers;
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java	(revision 2512)
@@ -30,5 +30,5 @@
  * This is non-modal dialog, always showing on top, which displays history information
  * about a given {@see OsmPrimitive}.
- * 
+ *
  */
 public class HistoryBrowserDialog extends JDialog implements HistoryDataSetListener{
@@ -40,5 +40,5 @@
     /**
      * displays the title for this dialog
-     * 
+     *
      * @param h the current history
      */
@@ -58,5 +58,5 @@
     /**
      * builds the GUI
-     * 
+     *
      */
     protected void build() {
@@ -88,5 +88,5 @@
     /**
      * constructor
-     * 
+     *
      * @param history  the history to be displayed
      */
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java	(revision 2512)
@@ -88,5 +88,5 @@
     /**
      * Hides and destroys all currently visible history browser dialogs
-     * 
+     *
      */
     public void hideAll() {
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java	(revision 2512)
@@ -103,5 +103,5 @@
     /**
      * Creates a new history browser model for a given history.
-     * 
+     *
      * @param history the history. Must not be null.
      * @throws IllegalArgumentException thrown if history is null
@@ -117,5 +117,5 @@
      * Replies the current edit layer; null, if there isn't a current edit layer
      * of type {@see OsmDataLayer}.
-     * 
+     *
      * @return the current edit layer
      */
@@ -258,10 +258,10 @@
      * Sets the {@see HistoryOsmPrimitive} which plays the role of a reference point
      * in time (see {@see PointInTimeType}).
-     * 
+     *
      * @param reference the reference history primitive. Must not be null.
      * @throws IllegalArgumentException thrown if reference is null
      * @throws IllegalStateException thrown if this model isn't a assigned a history yet
      * @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode
-     * 
+     *
      * @see #setHistory(History)
      * @see PointInTimeType
@@ -289,10 +289,10 @@
      * Sets the {@see HistoryOsmPrimitive} which plays the role of the current point
      * in time (see {@see PointInTimeType}).
-     * 
+     *
      * @param reference the reference history primitive. Must not be null.
      * @throws IllegalArgumentException thrown if reference is null
      * @throws IllegalStateException thrown if this model isn't a assigned a history yet
      * @throws IllegalArgumentException if reference isn't an history primitive for the history managed by this mode
-     * 
+     *
      * @see #setHistory(History)
      * @see PointInTimeType
@@ -357,5 +357,5 @@
      * representing the version currently edited in the current data
      * layer.
-     * 
+     *
      * @param primitive the primitive to check
      * @return true if primitive is the latest primitive
@@ -452,5 +452,4 @@
         }
     }
-
 
     /**
@@ -767,5 +766,5 @@
      * Removes this model as listener for data change and layer change
      * events.
-     * 
+     *
      */
     public void unlinkAsListener() {
@@ -875,5 +874,5 @@
     /**
      * Creates a {@see HistoryOsmPrimitive} from a {@see OsmPrimitive}
-     * 
+     *
      */
     class HistoryPrimitiveBuilder extends AbstractVisitor {
Index: trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java	(revision 2512)
@@ -28,7 +28,7 @@
  *
  * It provides a fluent API for configuration.
- * 
+ *
  * Sample usage:
- * 
+ *
  * 
        *   HistoryLoadTask task  = new HistoryLoadTask()
@@ -37,7 +37,7 @@
  *      .add(37234, OsmPrimitveType.RELATION)
  *      .add(aHistoryItem);
- * 
+ *
  *   Main.worker.execute(task);
- * 
+ *
  * 
      
  */
@@ -56,5 +56,5 @@
     /**
      * Adds an object whose history is to be loaded.
-     * 
+     *
      * @param id the object id
      * @param type the object type
@@ -73,5 +73,5 @@
     /**
      * Adds an object whose history is to be loaded.
-     * 
+     *
      * @param pid  the primitive id. Must not be null. Id > 0 required.
      * @return this task
@@ -88,5 +88,5 @@
     /**
      * Adds an object to be loaded, the object is specified by a history item.
-     * 
+     *
      * @param primitive the history item
      * @return this task
@@ -102,5 +102,5 @@
     /**
      * Adds an object to be loaded, the object is specified by an already loaded object history.
-     * 
+     *
      * @param history the history. Must not be null.
      * @return this task
@@ -116,5 +116,5 @@
     /**
      * Adds an object to be loaded, the object is specified by an OSM primitive.
-     * 
+     *
      * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required.
      * @return this task
@@ -133,5 +133,5 @@
     /**
      * Adds a collection of objects to loaded, specified by a collection of OSM primitives.
-     * 
+     *
      * @param primitive the OSM primitive. Must not be null. primitive.getId() > 0 required.
      * @return this task
Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java	(revision 2512)
@@ -16,5 +16,5 @@
 /**
  * The {@see TableCellRenderer} for a list of nodes in [@see HistoryBrower}
- * 
+ *
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java	(revision 2512)
@@ -9,5 +9,5 @@
 /**
  * The {@see TableColumnModel} for the table with the list of nodes.
- * 
+ *
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/NodeListViewer.java	(revision 2512)
@@ -32,5 +32,5 @@
  * NodeListViewer is a UI component which displays the node list of two
  * version of a {@see OsmPrimitive} in a {@see History}.
- * 
+ *
  * 
        
  *   
      • on the left, it displays the node list for the version at {@see PointInTimeType#REFERENCE_POINT_IN_TIME}
        • 
@@ -168,5 +168,4 @@
         }
     }
-
 
     class NodeListPopupMenu extends JPopupMenu {
Index: trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/PointInTimeType.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.history;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java	(revision 2512)
@@ -17,8 +17,7 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 
-
 /**
  * The {@see TableCellRenderer} for a list of relation members in {@see HistoryBrower}
- * 
+ *
  *
  */
@@ -39,5 +38,4 @@
         icons.put(OsmPrimitiveType.RELATION, ImageProvider.get("data", "relation"));
     }
-
 
     protected void renderIcon(RelationMember member) {
@@ -94,5 +92,4 @@
     }
 
-
     public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus,
             int row, int column) {
Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberListViewer.java	(revision 2512)
@@ -13,5 +13,5 @@
  * RelationMemberListViewer is a UI component which displays the  list of relation members of two
  * version of a {@see Relation} in a {@see History}.
- * 
+ *
  * 
          
  *   
        • on the left, it displays the list of relation members for the version at {@see PointInTimeType#REFERENCE_POINT_IN_TIME}
          • 
Index: trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/RelationMemberTableColumnModel.java	(revision 2512)
@@ -9,5 +9,5 @@
 /**
  * The {@see TableColumnModel} for the table with the list of relation members.
- * 
+ *
  */
 public class RelationMemberTableColumnModel extends DefaultTableColumnModel {
Index: trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagInfoViewer.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java	(revision 2512)
@@ -16,5 +16,5 @@
 /**
  * The {@see TableCellRenderer} for a list of tagsin {@see HistoryBrower}
- * 
+ *
  */
 public class TagTableCellRenderer extends JLabel implements TableCellRenderer {
Index: trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/TagTableColumnModel.java	(revision 2512)
@@ -9,5 +9,5 @@
 /**
  * The {@see TableColumnModel} for the table with the list of tags
- * 
+ *
  */
 public class TagTableColumnModel extends DefaultTableColumnModel{
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java	(revision 2512)
@@ -28,5 +28,5 @@
  * VersionInfoPanel is an UI component which displays the basic properties of a version
  * of a {@see OsmPrimitive}.
- * 
+ *
  */
 public class VersionInfoPanel extends JPanel implements Observer{
@@ -110,5 +110,5 @@
     /**
      * constructor
-     * 
+     *
      * @param model  the model (must not be null)
      * @param pointInTimeType the point in time this panel visualizes (must not be null)
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTable.java	(revision 2512)
@@ -24,5 +24,5 @@
 /**
  * VersionTable shows a list of version in a {@see History} of an {@see OsmPrimitive}.
- * 
+ *
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTableCellRenderer.java	(revision 2512)
@@ -24,5 +24,5 @@
 /**
  * The {@see TableCellRenderer} for a list of versions in {@see HistoryBrower}
- * 
+ *
  */
 public class VersionTableCellRenderer extends JLabel implements TableCellRenderer {
Index: trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java	(revision 2512)
@@ -9,5 +9,5 @@
 /**
  * The {@see TableColumnModel} for the table with the list of versions
- * 
+ *
  */
 public class VersionTableColumnModel extends DefaultTableColumnModel {
Index: trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/AbstractIOTask.java	(revision 2512)
@@ -4,5 +4,5 @@
 /**
  * This is an abstract task for uploading or saving a data layer.
- * 
+ *
  */
 public abstract class AbstractIOTask implements Runnable {
@@ -23,5 +23,5 @@
     /**
      * Replies true if the task has been cancelled
-     * 
+     *
      * @return true if the task has been cancelled
      */
@@ -32,5 +32,5 @@
     /**
      * Set whether this task has been cancelled
-     * 
+     *
      * @param cancelled true, if the task has been cancelled; false otherwise
      */
@@ -41,5 +41,5 @@
     /**
      * Replies true if the task has been failed
-     * 
+     *
      * @return true if the task has been failed
      */
@@ -50,5 +50,5 @@
     /**
      * Sets whether the task has been failed
-     * 
+     *
      * @param failed whether the task has been failed
      */
@@ -59,5 +59,5 @@
     /**
      * Replies the last exception caught
-     * 
+     *
      * @return the last exception caught; null, if no exception was caught
      */
@@ -68,5 +68,5 @@
     /**
      * Sets the last exception caught
-     * 
+     *
      * @param lastException the last exception
      */
@@ -78,5 +78,5 @@
      * Replies true if this  task was successful, i.e. if it wasn't
      * cancelled and didn't fail
-     * 
+     *
      * @return true if this  task was successful
      */
Index: trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java	(revision 2512)
@@ -18,5 +18,5 @@
 /**
  * A {@see ListCellRenderer} for the list of changesets in the upload dialog.
- * 
+ *
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetDialog.java	(revision 2512)
@@ -143,5 +143,5 @@
     /**
      * Sets whether this dialog is canceled
-     * 
+     *
      * @param canceled true, if this dialog is canceld
      */
@@ -152,5 +152,5 @@
     /**
      * Sets the collection of changesets to be displayed
-     * 
+     *
      * @param changesets the collection of changesets. Assumes an empty collection if null
      */
@@ -168,5 +168,5 @@
      * Replies a collection with the changesets the user selected.
      * Never null, but may be empty.
-     * 
+     *
      * @return a collection with the changesets the user selected.
      */
Index: trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/CloseChangesetTask.java	(revision 2512)
@@ -19,5 +19,5 @@
 /**
  * A task for closing a collection of changesets.
- * 
+ *
  */
 public class CloseChangesetTask extends PleaseWaitRunnable {
@@ -31,5 +31,5 @@
      * are still open and if they have an id > 0. Other changesets in the collection
      * are ignored.
-     * 
+     *
      * @param changesets  the collection of changesets. Empty collection assumes, if null.
      */
Index: trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/DownloadOpenChangesetsTask.java	(revision 2512)
@@ -36,5 +36,5 @@
 
     /**
-     * 
+     *
      * @param model provides the user id of the current user and accepts the changesets
      * after download
@@ -79,5 +79,5 @@
      * Fetch the user info from the server. This is necessary if we don't know
      * the users id yet
-     * 
+     *
      * @return the user info
      * @throws OsmTransferException thrown in case of any communication exception
Index: trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/FilenameCellEditor.java	(revision 2512)
@@ -28,5 +28,5 @@
  * This is a {@see TableCellEditor} for filenames. It provides a text input field and
  * a button for launchinig a {@see JFileChooser}.
- * 
+ *
  *
  */
@@ -48,5 +48,4 @@
         gc.weighty = 1.0;
         add(tfFileName = new JTextField(), gc);
-
 
         gc.gridx = 1;
@@ -71,5 +70,4 @@
         build();
     }
-
 
     public void addCellEditorListener(CellEditorListener l) {
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveFlagCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveFlagCellEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveFlagCellEditor.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java	(revision 2512)
@@ -10,5 +10,5 @@
  * SaveLayerInfo represents the information, user preferences and save/upload states of
  * a layer which might be uploaded/saved.
- * 
+ *
  */
 class SaveLayerInfo implements Comparable {
@@ -23,5 +23,5 @@
 
     /**
-     * 
+     *
      * @param layer the layer. Must not be null.
      * @throws IllegalArgumentException thrown if layer is null
@@ -38,5 +38,5 @@
     /**
      * Replies the layer this info objects holds information for
-     * 
+     *
      * @return the layer this info objects holds information for
      */
@@ -47,5 +47,5 @@
     /**
      * Replies true if this layer should be saved to a file; false, otherwise
-     * 
+     *
      * @return true if this layers should be saved to a file; false, otherwise
      */
@@ -56,5 +56,5 @@
     /**
      * Sets whether this layer should be saved to a file
-     * 
+     *
      * @param doSaveToFile true to save; false, to skip saving
      */
@@ -65,5 +65,5 @@
     /**
      * Replies true if this layer should be uploaded to the server; false, otherwise
-     * 
+     *
      * @return true if this layer should be uploaded to the server; false, otherwise
      */
@@ -74,5 +74,5 @@
     /**
      * Sets whether this layer should be uploaded to a file
-     * 
+     *
      * @param doSaveToFile true to upload; false, to skip uploading
      */
@@ -84,5 +84,5 @@
     /**
      * Replies true if this layer should be uploaded to the server and saved to file.
-     * 
+     *
      * @return true if this layer should be uploaded to the server and saved to file
      */
@@ -93,5 +93,5 @@
     /**
      * Replies the name of the layer
-     * 
+     *
      * @return the name of the layer
      */
@@ -102,5 +102,5 @@
     /**
      * Replies the file this layer should be saved to, if {@see #isDoSaveToFile()} is true
-     * 
+     *
      * @return the file this layer should be saved to, if {@see #isDoSaveToFile()} is true
      */
@@ -111,5 +111,5 @@
     /**
      * Sets the file this layer should be saved to, if {@see #isDoSaveToFile()} is true
-     * 
+     *
      * @param file the file
      */
@@ -147,5 +147,5 @@
      *   
        • {@see UploadOrSaveState#FAILED} if uploading {@see #getLayer() has failed
          • 
      * 
        
-     * 
+     *
      * @return the upload state
      */
@@ -156,5 +156,5 @@
     /**
      * Sets the upload state for {@see #getLayer()}
-     * 
+     *
      * @param uploadState the upload state
      */
@@ -170,5 +170,5 @@
      *   
      • {@see UploadOrSaveState#FAILED} if saving {@see #getLayer() has failed
        • 
      * 
      
-     * 
+     *
      * @return the save state
      */
@@ -179,5 +179,5 @@
     /**
      * Sets the save state for {@see #getLayer()}
-     * 
+     *
      * @param saveState save the upload state
      */
@@ -188,5 +188,5 @@
     /**
      * Resets the upload and save state
-     * 
+     *
      * @see #setUploadState(UploadOrSaveState)
      * @see #setSaveState(UploadOrSaveState)
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java	(revision 2512)
@@ -20,5 +20,5 @@
  * This is a {@see TableCellRenderer} for rendering the various fields of a
  * {@see SaveLayerInfo} in the table {@see SaveLayersTable}.
- * 
+ *
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayerTask.java	(revision 2512)
@@ -11,5 +11,5 @@
  * SaveLayerTask saves the data managed by an {@see OsmDataLayer} to the
  * {@see OsmDataLayer#getAssociatedFile()}.
- * 
+ *
  * 
        *     ExecutorService executorService = ...
@@ -29,5 +29,5 @@
 
     /**
-     * 
+     *
      * @param layerInfo information about the layer to be saved to save. Must not be null.
      * @param monitor the monitor. Set to {@see NullProgressMonitor#INSTANCE} if null
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 2512)
@@ -84,5 +84,5 @@
     /**
      * builds the button row
-     * 
+     *
      * @return the panel with the button row
      */
@@ -377,5 +377,5 @@
      * This is the asynchronous task which uploads modified layers to the server and
      * saves them to files, if requested by the user.
-     * 
+     *
      */
     protected class SaveAndUploadTask implements Runnable {
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersModel.java	(revision 2512)
@@ -153,5 +153,4 @@
     }
 
-
     public void setUploadState(OsmDataLayer layer, UploadOrSaveState state) {
         SaveLayerInfo info = getSaveLayerInfo(layer);
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTable.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/SaveLayersTableColumnModel.java	(revision 2512)
@@ -8,5 +8,4 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
-
 
 class SaveLayersTableColumnModel extends DefaultTableColumnModel {
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadAndSaveProgressRenderer.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java	(revision 2512)
@@ -77,5 +77,5 @@
     /**
      * Replies the unique instance of the upload dialog
-     * 
+     *
      * @return the unique instance of the upload dialog
      */
@@ -113,5 +113,5 @@
     /**
      * builds the panel with the lists of primitives
-     * 
+     *
      * @return the panel with the lists of primitives
      */
@@ -126,5 +126,5 @@
     /**
      * builds the content panel for the upload dialog
-     * 
+     *
      * @return the content panel
      */
@@ -168,5 +168,5 @@
     /**
      * builds the panel with the OK and CANCEL buttons
-     * 
+     *
      * @return
      */
@@ -243,5 +243,5 @@
     /**
      * sets the collection of primitives which will be uploaded
-     * 
+     *
      * @param add  the collection of primitives to add
      * @param update the collection of primitives to update
@@ -312,5 +312,5 @@
     /**
      * Replies the current changeset
-     * 
+     *
      * @return the current changeset
      */
@@ -329,5 +329,5 @@
      * changesets. If it is closed, removes it from the list of open
      * changesets.
-     * 
+     *
      * @param cs the changeset
      */
@@ -339,5 +339,5 @@
      * Removes cs from the list of open changesets in the upload
      * dialog
-     * 
+     *
      * @param cs the changeset. Ignored if null.
      */
@@ -350,5 +350,5 @@
      * Replies true if the changeset is to be closed after the
      * next upload
-     * 
+     *
      * @return true if the changeset is to be closed after the
      * next upload; false, otherwise
@@ -360,5 +360,5 @@
     /**
      * Replies the default value for "created_by"
-     * 
+     *
      * @return the default value for "created_by"
      */
@@ -370,5 +370,5 @@
     /**
      * Replies the current value for the upload comment
-     * 
+     *
      * @return the current value for the upload comment
      */
@@ -386,5 +386,5 @@
     /**
      * Replies true, if the dialog was canceled
-     * 
+     *
      * @return true, if the dialog was canceled
      */
@@ -395,5 +395,5 @@
     /**
      * Sets whether the dialog was canceld
-     * 
+     *
      * @param canceled true, if the dialog is canceled
      */
@@ -421,5 +421,5 @@
      * This change listener is triggered when current tab in the tabbed pane in
      * the lower half of the dialog is changed.
-     * 
+     *
      * It's main purpose is to keep the content in the text field for the changeset
      * comment in sync with the changeset tag "comment".
@@ -518,5 +518,4 @@
             putValue(SHORT_DESCRIPTION, tr("Cancel the upload and resume editing"));
         }
-
 
         public void actionPerformed(ActionEvent e) {
@@ -613,5 +612,5 @@
          * build the panel with the widgets for controlling whether an atomic upload
          * should be used or not
-         * 
+         *
          * @return the panel
          */
@@ -798,5 +797,5 @@
         /**
          * Replies the current upload comment
-         * 
+         *
          * @return
          */
@@ -807,5 +806,5 @@
         /**
          * Replies the current upload comment
-         * 
+         *
          * @return
          */
@@ -881,5 +880,5 @@
         /**
          * Remove a changeset from the list of open changeset
-         * 
+         *
          * @param cs the changeset to be removed. Ignored if null.
          */
@@ -908,5 +907,5 @@
         /**
          * Sets whether a new changeset is to be used
-         * 
+         *
          */
         public void setUseNewChangeset() {
@@ -927,5 +926,5 @@
          * Replies true if the selected changeset should be closed after the
          * next upload
-         * 
+         *
          * @return true if the selected changeset should be closed after the
          * next upload
@@ -994,5 +993,5 @@
         /**
          * Refreshes the list of open changesets
-         * 
+         *
          */
         class RefreshAction extends AbstractAction {
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadLayerTask.java	(revision 2512)
@@ -23,5 +23,5 @@
 /**
  * UploadLayerTask uploads the data managed by an {@see OsmDataLayer} asynchronously.
- * 
+ *
  * 
        *     ExecutorService executorService = ...
@@ -46,5 +46,5 @@
 
     /**
-     * 
+     *
      * @param layer the layer. Must not be null.
      * @param monitor  a progress monitor. If monitor is null, uses {@see NullProgressMonitor#INSTANCE}
@@ -77,5 +77,5 @@
      * Retries to recover the upload operation from an exception which was thrown because
      * an uploaded primitive was already deleted on the server.
-     * 
+     *
      * @param e the exception throw by the API
      * @param monitor a progress monitor
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadOrSaveState.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/io/UploadSelectionDialog.java	(revision 2512)
@@ -47,5 +47,5 @@
 /**
  * This dialog can be used to select individual object for uploading.
- * 
+ *
  *
  */
Index: trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java	(revision 2512)
@@ -103,5 +103,4 @@
             volatile Image scaledImage;
 
-
             public Entry(File file, int width, int height, int maxSize, ImageLoadedListener listener) {
                 this.file = file;
@@ -222,5 +221,4 @@
             }
         }
-
 
         public synchronized boolean imageUpdate(Image img, int infoflags, int x, int y, int width, int height) {
@@ -322,5 +320,4 @@
                 gpxSubTask.finishTask();
             }
-
 
             if (gps.isEmpty())
Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java	(revision 2512)
@@ -665,5 +665,4 @@
             } // end for trk
         } // end if lines
-
 
         /****************************************************************
Index: trunk/src/org/openstreetmap/josm/gui/layer/Layer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/Layer.java	(revision 2512)
@@ -66,5 +66,5 @@
     /**
      * The visibility state of the layer.
-     * 
+     *
      */
     private boolean visible = true;
@@ -72,5 +72,5 @@
     /**
      * The layer should be handled as a background layer in automatic handling
-     * 
+     *
      */
     private boolean background = false;
@@ -78,5 +78,5 @@
     /**
      * The name of this layer.
-     * 
+     *
      */
     private  String name;
@@ -145,8 +145,7 @@
     public void setAssociatedFile(File file) { associatedFile = file; }
 
-
     /**
      * Replies the name of the layer
-     * 
+     *
      * @return the name of the layer
      */
@@ -174,5 +173,5 @@
     /**
      * Replies true if this layer is a background layer
-     * 
+     *
      * @return true if this layer is a background layer
      */
@@ -183,5 +182,5 @@
     /**
      * Sets whether this layer is a background layer
-     * 
+     *
      * @param background true, if this layer is a background layer
      */
@@ -193,5 +192,5 @@
      * Sets the visibility of this layer. Emits property change event for
      * property {@see #VISIBLE_PROP}.
-     * 
+     *
      * @param visible true, if the layer is visible; false, otherwise.
      */
@@ -221,5 +220,5 @@
     /**
      * Adds a {@see PropertyChangeListener}
-     * 
+     *
      * @param listener the listener
      */
@@ -230,5 +229,5 @@
     /**
      * Removes a {@see PropertyChangeListener}
-     * 
+     *
      * @param listener the listener
      */
@@ -239,5 +238,5 @@
     /**
      * fires a property change for the property {@see #VISIBLE_PROP}
-     * 
+     *
      * @param oldValue the old value
      * @param newValue the new value
@@ -249,5 +248,5 @@
     /**
      * The action to save a layer
-     * 
+     *
      */
     public static class LayerSaveAction extends AbstractAction {
Index: trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/MapViewPaintable.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 2512)
@@ -324,5 +324,5 @@
     /**
      * Warns the user about the number of detected conflicts
-     * 
+     *
      * @param numNewConflicts the number of detected conflicts
      * @param numPurgedPrimitives the number of automatically purged objects
@@ -389,5 +389,5 @@
      * from the local dataset because they've been deleted on the
      * server.
-     * 
+     *
      * @return the purge command. null if no primitives have to
      * be purged
@@ -665,5 +665,5 @@
      * Replies true if the data managed by this layer needs to be uploaded to
      * the server because it contains at least one modified primitive.
-     * 
+     *
      * @return true if the data managed by this layer needs to be uploaded to
      * the server because it contains at least one modified primitive; false,
@@ -679,5 +679,5 @@
      * if the data managed by this layer has been modified since the last
      * save operation to the file.
-     * 
+     *
      * @return true if the data managed by this layer needs to be saved to
      * a file
@@ -689,5 +689,5 @@
     /**
      * Initializes the layer after a successful load of OSM data from a file
-     * 
+     *
      */
     public void onPostLoadFromFile() {
@@ -703,5 +703,5 @@
     /**
      * Initializes the layer after a successful save of OSM data to a file
-     * 
+     *
      */
     public void onPostSaveToFile() {
@@ -712,5 +712,5 @@
     /**
      * Initializes the layer after a successful upload to the server
-     * 
+     *
      */
     public void onPostUploadToServer() {
Index: trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java	(revision 2512)
@@ -446,5 +446,4 @@
     }
 
-
     public final  class ShowHideMarkerText extends AbstractAction {
         private final Layer layer;
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyle.java	(revision 2512)
@@ -45,5 +45,2 @@
     }
 }
-
-
-
Index: trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/mappaint/IconElemStyle.java	(revision 2512)
@@ -25,5 +25,5 @@
         annotate = true;
     }
-    
+
     public ImageIcon getDisabledIcon() {
         if (disabledIcon != null)
Index: trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java	(revision 2512)
@@ -215,5 +215,4 @@
     }
 
-
     private void editPreference(final PreferenceDialog gui, final JTable list) {
         if (list.getSelectedRowCount() != 1) {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java	(revision 2512)
@@ -49,5 +49,4 @@
     }
 
-
     private DefaultTableModel tableModel;
     private JTable colors;
Index: trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceSetting.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui.preferences;
-
 
 public interface PreferenceSetting {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java	(revision 2512)
@@ -79,7 +79,6 @@
     private String availableStylesUrl;
 
-
     /**
-     * 
+     *
      * @param stylesPreferencesKey the preferences key with the list of active style sources (filenames and URLs)
      * @param iconsPreferenceKey the preference key with the list of icon sources (can be null)
@@ -145,5 +144,4 @@
         tblActiveStyles.getActionMap().put("delete", removeActiveStylesAction);
         JButton delete = new JButton(removeActiveStylesAction);
-
 
         ActivateStylesAction activateStylesAction = new ActivateStylesAction();
@@ -270,5 +268,4 @@
         }
     }
-
 
     class ActiveStylesModel extends AbstractTableModel {
@@ -839,5 +836,4 @@
             add(tfFileName = new JTextField(), gc);
 
-
             gc.gridx = 1;
             gc.gridy = 0;
@@ -862,5 +858,4 @@
         }
 
-
         public void addCellEditorListener(CellEditorListener l) {
             if (!listeners.contains(l)) {
@@ -925,5 +920,4 @@
             return this;
         }
-
 
         class LaunchFileChooserAction extends AbstractAction {
Index: trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/preferences/ToolbarPreferences.java	(revision 2512)
@@ -424,5 +424,4 @@
     }
 
-
     private void loadAction(DefaultMutableTreeNode node, MenuElement menu) {
         Object userObject = null;
Index: trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/AbstractProgressMonitor.java	(revision 2512)
@@ -6,5 +6,4 @@
 import java.util.LinkedList;
 import java.util.Queue;
-
 
 public abstract class AbstractProgressMonitor implements ProgressMonitor {
Index: trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/NullProgressMonitor.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.gui.progress;
-
 
 public class NullProgressMonitor implements ProgressMonitor {
Index: trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/PleaseWaitProgressMonitor.java	(revision 2512)
@@ -17,5 +17,4 @@
 import org.openstreetmap.josm.gui.PleaseWaitDialog;
 import static org.openstreetmap.josm.tools.I18n.tr;
-
 
 public class PleaseWaitProgressMonitor extends AbstractProgressMonitor {
Index: trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/ProgressMonitor.java	(revision 2512)
@@ -120,8 +120,7 @@
     void removeCancelListener(CancelListener listener);
 
-
     /**
      * Appends a message to the log managed by the progress monitor.
-     * 
+     *
      * @param message the log message. Ignored if null or white space only.
      */
Index: trunk/src/org/openstreetmap/josm/gui/progress/ProgressRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/ProgressRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/ProgressRenderer.java	(revision 2512)
@@ -5,5 +5,5 @@
  * Swing components can implement this interface and use a {@see SwingRenderingProgressMonitor}
  * to render progress information.
- * 
+ *
  */
 public interface ProgressRenderer {
Index: trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/progress/SwingRenderingProgressMonitor.java	(revision 2512)
@@ -17,8 +17,8 @@
 
     /**
-     * 
+     *
      * @param delegate the delegate which renders the progress information. Must not be null.
      * @throws IllegalArgumentException thrown if delegate is null
-     * 
+     *
      */
     public SwingRenderingProgressMonitor(ProgressRenderer delegate) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/AutoCompletingTextField.java	(revision 2512)
@@ -26,8 +26,8 @@
  * AutoCompletingTextField is an text field with autocompletion behaviour. It
  * can be used as table cell editor in {@see JTable}s.
- * 
+ *
  * Autocompletion is controlled by a list of {@see AutoCompletionListItem}s
  * managed in a {@see AutoCompletionList}.
- * 
+ *
  *
  */
@@ -43,5 +43,5 @@
         /**
          * inserts a string at a specific position
-         * 
+         *
          */
         @Override
@@ -110,5 +110,5 @@
     /**
      * creates the default document model for this editor
-     * 
+     *
      */
     @Override
@@ -160,5 +160,5 @@
 
     /**
-     * 
+     *
      * @return the auto completion list; may be null, if no auto completion list is set
      */
@@ -228,5 +228,4 @@
     }
 
-
     public boolean shouldSelectCell(EventObject anEvent) {
         return true;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagCellEditor.java	(revision 2512)
@@ -16,5 +16,5 @@
 /**
  * This is the table cell editor for the tag editor dialog.
- * 
+ *
  */
 @SuppressWarnings("serial")
@@ -49,5 +49,5 @@
      * values from the the current JOSM data set. Keys already present in the
      * current tag model are removed from the auto completion list.
-     * 
+     *
      * @param model  the tag editor model
      * @param currentTag  the current tag
@@ -78,5 +78,4 @@
     }
 
-
     /**
      * initializes the auto completion list when the cell editor starts to edit
@@ -84,5 +83,5 @@
      * set of standard values for a given key and the set of values present in the
      * current data set for the given key.
-     * 
+     *
      * @param forKey the key
      */
@@ -99,5 +98,4 @@
         }
     }
-
 
     /**
@@ -163,5 +161,5 @@
     /**
      * replies the {@link AutoCompletionList} this table cell editor synchronizes with
-     * 
+     *
      * @return the auto completion list
      */
@@ -195,5 +193,5 @@
     /**
      * sets the tag editor model
-     * 
+     *
      * @param tagEditorModel  the tag editor model
      */
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagCellRenderer.java	(revision 2512)
@@ -17,9 +17,8 @@
 import javax.swing.table.TableCellRenderer;
 
-
 /**
  * This is the table cell renderer for cells for the table of tags
  * in the tag editor dialog.
- * 
+ *
  *
  */
@@ -49,5 +48,5 @@
      * renders the name of a tag in the second column of
      * the table
-     * 
+     *
      * @param tag  the tag
      */
@@ -59,5 +58,5 @@
      * renders the value of a a tag in the third column of
      * the table
-     * 
+     *
      * @param tag  the  tag
      */
@@ -72,6 +71,4 @@
         }
     }
-
-
 
     /**
@@ -93,5 +90,5 @@
      * displays the tag which is suggested by the currently selected
      * preset.
-     * 
+     *
      * @param tagModel the tag model
      * @param model the tag editor model
@@ -101,8 +98,7 @@
     }
 
-
     /**
      * replies the cell renderer component for a specific cell
-     * 
+     *
      * @param table  the table
      * @param value the value to be rendered
@@ -111,5 +107,5 @@
      * @param rowIndex the row index
      * @param vColIndex the column index
-     * 
+     *
      * @return the renderer component
      */
@@ -125,5 +121,4 @@
             renderBackgroundColor(getModel(table).get(rowIndex), getModel(table));
         }
-
 
         switch(vColIndex) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java	(revision 2512)
@@ -23,5 +23,4 @@
 import org.openstreetmap.josm.data.osm.Tagged;
 
-
 /**
  * TagEditorModel is a table model.
@@ -118,5 +117,4 @@
     }
 
-
     public void prepend(TagModel tag) {
         if (tag == null)
@@ -126,5 +124,4 @@
         fireTableDataChanged();
     }
-
 
     /**
@@ -154,5 +151,4 @@
     }
 
-
     /**
      * replies the tag with name name; null, if no such tag exists
@@ -174,11 +170,8 @@
     }
 
-
-
     @Override public boolean isCellEditable(int row, int col) {
         // all cells are editable
         return true;
     }
-
 
     /**
@@ -220,5 +213,5 @@
     /**
      * Deletes all tags with name name
-     * 
+     *
      * @param name the name. Ignored if null.
      */
@@ -257,5 +250,4 @@
     }
 
-
     /**
      * creates a new tag and appends it to the model
@@ -372,5 +364,4 @@
         return false;
     }
-
 
     protected Command createUpdateTagCommand(Collection primitives, TagModel tag) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagEditorPanel.java	(revision 2512)
@@ -30,5 +30,5 @@
  * a new tag and one for deleting the currently selected tags.
  *
- * 
+ *
  */
 public class TagEditorPanel extends JPanel {
@@ -41,8 +41,7 @@
     private AutoCompletionList acList;
 
-
     /**
      * builds the panel with the table for editing tags
-     * 
+     *
      * @return the panel
      */
@@ -60,5 +59,5 @@
     /**
      * builds the panel with the button row
-     * 
+     *
      * @return the panel
      */
@@ -119,5 +118,5 @@
     /**
      * Replies the tag editor model used by this panel.
-     * 
+     *
      * @return the tag editor model used by this panel
      */
@@ -152,5 +151,5 @@
     /**
      * The action for deleting the currently selected tags
-     * 
+     *
      *
      */
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagModel.java	(revision 2512)
@@ -6,125 +6,124 @@
 
 public class TagModel {
-	
-	/** the name of the tag */
-	private String name = null;
-	
-	/** the list of values */
-	private ArrayList values = null;
-	
-	/**
-	 * constructor
-	 */
-	public TagModel() {
-		values = new ArrayList();
-		setName("");
-		setValue("");
-	}
-	
-	/**
-	 * constructor 
-	 * @param name the tag name 
-	 */
-	public TagModel(String name) {
-		this();
-		setName(name);
-	}
-	
-	/**
-	 * constructor 
-	 * 
-	 * @param name the tag name 
-	 * @param value the tag value 
-	 */
-	public TagModel(String name, String value) {
-		this();
-		setName(name);
-		setValue(value);
-	}
-	
-	/**
-	 * sets the name. Converts name to "" if null.
-	 * @param name the tag name 
-	 */
-	public void setName(String name) {
-		name = (name == null) ? "" : name;
-		this.name = name; 
-	}
-	
-	/** 
-	 * @return the tag name 
-	 */
-	public String getName(){
-		return name;
-	}
-	
-	/**
-	 * removes all values from the list of values 
-	 */
-	public void clearValues() {
-		this.values.clear();
-	}
-	
-	/**
-	 * sets a unique value for this tag. Converts value to "", if null.
-	 * @param value the value. 
-	 */
-	public void setValue(String value) {
-		value = (value == null) ? "" : value;
-		clearValues();
-		this.values.add(value);
-	}
-	
-	/**
-	 * 
-	 * @param value the value to be checked; converted to "" if null 
-	 * @return true, if the values of this tag include value; false otherwise 
-	 */
-	public boolean hasValue(String value) {
-		value = (value == null) ? "" : value;
-		return values.contains(value);
-	}
-	
-	public void addValue(String value) {
-		value = (value == null) ? "" : value;
-		if (hasValue(value)) {
-			return; 
-		}
-		values.add(value);
-	}
-	
-	
-	/**
-	 * removes a value from the list of values. Converts value to "" if null
-	 * @param value the value 
-	 */
-	public void removeValue(String value){
-		value = (value == null) ? "" : value; 
-		values.remove(value);
-	}	
-	
-	public List getValues() {
-		return values;
-	}
-	
-	public String getValue() {
-		if (getValueCount() == 0) {
-			return "";
-		} else if (getValueCount() == 1) {
-			return values.get(0);
-		} else {
-			StringBuilder sb = new StringBuilder();			
-			for (int i =0; i < values.size(); i++) {
-				sb.append(values.get(i));
-				if (i + 1 < values.size()) {
-					sb.append(";");
-				}
-			}
-			return sb.toString();
-		}
-	}
-	
-	public int getValueCount() {
-		return values.size();
-	}
+
+    /** the name of the tag */
+    private String name = null;
+
+    /** the list of values */
+    private ArrayList values = null;
+
+    /**
+     * constructor
+     */
+    public TagModel() {
+        values = new ArrayList();
+        setName("");
+        setValue("");
+    }
+
+    /**
+     * constructor
+     * @param name the tag name
+     */
+    public TagModel(String name) {
+        this();
+        setName(name);
+    }
+
+    /**
+     * constructor
+     *
+     * @param name the tag name
+     * @param value the tag value
+     */
+    public TagModel(String name, String value) {
+        this();
+        setName(name);
+        setValue(value);
+    }
+
+    /**
+     * sets the name. Converts name to "" if null.
+     * @param name the tag name
+     */
+    public void setName(String name) {
+        name = (name == null) ? "" : name;
+        this.name = name;
+    }
+
+    /**
+     * @return the tag name
+     */
+    public String getName(){
+        return name;
+    }
+
+    /**
+     * removes all values from the list of values
+     */
+    public void clearValues() {
+        this.values.clear();
+    }
+
+    /**
+     * sets a unique value for this tag. Converts value to "", if null.
+     * @param value the value.
+     */
+    public void setValue(String value) {
+        value = (value == null) ? "" : value;
+        clearValues();
+        this.values.add(value);
+    }
+
+    /**
+     *
+     * @param value the value to be checked; converted to "" if null
+     * @return true, if the values of this tag include value; false otherwise
+     */
+    public boolean hasValue(String value) {
+        value = (value == null) ? "" : value;
+        return values.contains(value);
+    }
+
+    public void addValue(String value) {
+        value = (value == null) ? "" : value;
+        if (hasValue(value)) {
+            return;
+        }
+        values.add(value);
+    }
+
+    /**
+     * removes a value from the list of values. Converts value to "" if null
+     * @param value the value
+     */
+    public void removeValue(String value){
+        value = (value == null) ? "" : value;
+        values.remove(value);
+    }
+
+    public List getValues() {
+        return values;
+    }
+
+    public String getValue() {
+        if (getValueCount() == 0) {
+            return "";
+        } else if (getValueCount() == 1) {
+            return values.get(0);
+        } else {
+            StringBuilder sb = new StringBuilder();
+            for (int i =0; i < values.size(); i++) {
+                sb.append(values.get(i));
+                if (i + 1 < values.size()) {
+                    sb.append(";");
+                }
+            }
+            return sb.toString();
+        }
+    }
+
+    public int getValueCount() {
+        return values.size();
+    }
 }
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java	(revision 2512)
@@ -60,5 +60,4 @@
             TagCellRenderer renderer = new TagCellRenderer();
 
-
             // column 0 - tag key
             col = new TableColumn(0);
@@ -120,5 +119,4 @@
     }
 
-
     /**
      * Action to be run when the user navigates to the previous cell in the table,
@@ -134,5 +132,4 @@
                 getCellEditor().stopCellEditing();
             }
-
 
             if (col <= 0 && row <= 0) {
@@ -206,6 +203,4 @@
             getColumnModel().getSelectionModel().addListSelectionListener(this);
         }
-
-
 
         @Override
@@ -270,5 +265,4 @@
     }
 
-
     /** the delete action */
     private RunnableAction deleteAction = null;
@@ -364,5 +358,4 @@
     }
 
-
     /**
      * @param autoCompletionList
@@ -414,5 +407,5 @@
         // tblTagEditor.editCellAt(row, col);
         // if (tblTagEditor.getEditorComponent() != null) {
-        //	tblTagEditor.getEditorComponent().requestFocusInWindow();
+        //  tblTagEditor.getEditorComponent().requestFocusInWindow();
         // }
 
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java	(revision 2512)
@@ -151,5 +151,4 @@
 
         private JComponent value;
-
 
         @Override public boolean addToPanel(JPanel p, Collection sel) {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPresetSeparator.java	(revision 2512)
@@ -1,5 +1,4 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.gui.tagging;
-
 
 public class TaggingPresetSeparator extends TaggingPreset {
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionCache.java	(revision 2512)
@@ -67,5 +67,4 @@
     }
 
-
     /** the cached tags give by a tag key and a list of values for this tag*/
     private HashMap> tagCache;
@@ -74,5 +73,4 @@
     /**  the layer this cache is built for */
     private OsmDataLayer layer;
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java	(revision 2512)
@@ -12,5 +12,4 @@
     IS_IN_STANDARD,
 
-
     /**
      * indicates that this is an arbitrary value from the data set, i.e.
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java	(revision 2512)
@@ -13,8 +13,8 @@
 /**
  * AutoCompletionList manages a list of {@see AutoCompletionListItem}s.
- * 
+ *
  * The list is sorted, items with higher priority first, then according to lexicographic order
  * on the value of the {@see AutoCompletionListItem}.
- * 
+ *
  * AutoCompletionList maintains two views on the list of {@see AutoCompletionListItem}s.
  * 
        
@@ -22,8 +22,8 @@
  *   
      1. a filtered view, which includes only items which match a current filter expression
        2. 
  * 
      
- * 
+ *
  * AutoCompletionList is an {@link AbstractTableModel} which serves the list of filtered
  * items to a {@link JTable}.
- * 
+ *
  */
 public class AutoCompletionList extends AbstractTableModel {
@@ -47,12 +47,11 @@
     }
 
-
     /**
      * applies a filter expression to the list of {@see AutoCompletionListItem}s.
-     * 
+     *
      * The matching criterion is a case insensitive substring match.
-     * 
+     *
      * @param filter  the filter expression; must not be null
-     * 
+     *
      * @exception IllegalArgumentException thrown, if filter is null
      */
@@ -66,5 +65,5 @@
     /**
      * clears the current filter
-     * 
+     *
      */
     public void clearFilter() {
@@ -80,9 +79,8 @@
     }
 
-
     /**
      * adds an AutoCompletionListItem to the list. Only adds the item if it
      * is not null and if not in the list yet.
-     * 
+     *
      * @param item the item
      */
@@ -95,9 +93,8 @@
     }
 
-
     /**
      * adds another AutoCompletionList to this list. An item is only
      * added it is not null and if it does not exist in the list yet.
-     * 
+     *
      * @param other another auto completion list; must not be null
      * @exception IllegalArgumentException thrown, if other is null
@@ -113,9 +110,8 @@
     }
 
-
     /**
      * adds a list of AutoCompletionListItem to this list. Only items which
      * are not null and which do not exist yet in the list are added.
-     * 
+     *
      * @param other a list of AutoCompletionListItem; must not be null
      * @exception IllegalArgumentException thrown, if other is null
@@ -134,5 +130,5 @@
      * adds a list of strings to this list. Only strings which
      * are not null and which do not exist yet in the list are added.
-     * 
+     *
      * @param value a list of strings to add
      * @param priority the priority to use
@@ -171,5 +167,5 @@
      * checks whether a specific item is already in the list. Matches for the
      * the value and the priority of the item
-     * 
+     *
      * @param item the item to check
      * @return true, if item is in the list; false, otherwise
@@ -184,5 +180,5 @@
      * checks whether an item with the given value is already in the list. Ignores
      * priority of the items.
-     * 
+     *
      * @param value the value of an auto completion item
      * @return true, if value is in the list; false, otherwise
@@ -246,5 +242,5 @@
     /**
      * replies the number of filtered items
-     * 
+     *
      * @return the number of filtered items
      */
@@ -257,5 +253,5 @@
      * @param idx the index; must be in the range 0<= idx < {@see #getFilteredSize()}
      * @return the item
-     * 
+     *
      * @exception IndexOutOfBoundsException thrown, if idx is out of bounds
      */
@@ -266,8 +262,7 @@
     }
 
-
     /**
      * removes all elements from the auto completion list
-     * 
+     *
      */
     public void clear() {
@@ -277,5 +272,4 @@
     }
 
-
     public int getColumnCount() {
         return 1;
Index: trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionListItem.java	(revision 2512)
@@ -4,7 +4,7 @@
 /**
  * Represents an entry in the list of auto completion values.
- * 
+ *
  *  An AutoCompletionListItem has a priority and a value.
- * 
+ *
  *  The priority helps to sort the auto completion items according to their importance. For instance,
  *  in an auto completion list for tag names, standard tag names would be assigned a higher
@@ -13,5 +13,5 @@
  *
  * The value is a string which will be displayed in the auto completion list.
- * 
+ *
  */
 public class AutoCompletionListItem implements Comparable{
@@ -36,5 +36,5 @@
 
     /**
-     * 
+     *
      * @return the priority
      */
@@ -52,5 +52,5 @@
 
     /**
-     * 
+     *
      * @return the value
      */
@@ -112,5 +112,4 @@
     }
 
-
     public int compareTo(AutoCompletionListItem other) {
         int ret = this.priority.compareTo(other.priority);
Index: trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/util/TableCellEditorSupport.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/AutoCompleteComboBox.java	(revision 2512)
@@ -18,5 +18,4 @@
  */
 public class AutoCompleteComboBox extends JComboBox {
-
 
     private boolean autocompleteEnabled = true;
Index: trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/HistoryComboBox.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java	(revision 2512)
@@ -12,5 +12,4 @@
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.xml.sax.SAXException;
-
 
 public class BoundingBoxDownloader extends OsmServerReader {
@@ -41,5 +40,5 @@
         try {
             progressMonitor.indeterminateSubTask(tr("Contacting OSM Server..."));
-            String url = "trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";            
+            String url = "trackpoints?bbox="+lon1+","+lat1+","+lon2+","+lat2+"&page=";
 
             boolean done = false;
Index: trunk/src/org/openstreetmap/josm/io/CacheFiles.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CacheFiles.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/CacheFiles.java	(revision 2512)
@@ -175,5 +175,4 @@
     }
 
-
     /**
      * Sets the amount of time data is stored before it gets expired
Index: trunk/src/org/openstreetmap/josm/io/Capabilities.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/Capabilities.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/Capabilities.java	(revision 2512)
@@ -32,5 +32,5 @@
      * replies the value of configuration item in the capabilities as
      * double value
-     * 
+     *
      * @param element  the name of the element
      * @param attribute the name of the attribute
Index: trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/ChangesetClosedException.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/ChangesetQuery.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/CredentialsManager.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/CredentialsManager.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/CredentialsManager.java	(revision 2512)
@@ -5,11 +5,11 @@
 
 /**
- * Manages how username and password are stored. In addition all 
+ * Manages how username and password are stored. In addition all
  * username/password-related user interaction is encapsulated here.
  */
 public interface CredentialsManager {
     enum Key {
-        OSM_SERVER_URL("url"), 
-        USERNAME("username"), 
+        OSM_SERVER_URL("url"),
+        USERNAME("username"),
         PASSWORD("password");
         final private String pname;
@@ -21,5 +21,5 @@
         }
     };
-    
+
     /**
      * Should throw or return non-null, possibly empty String.
Index: trunk/src/org/openstreetmap/josm/io/GpxReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/GpxReader.java	(revision 2512)
@@ -182,7 +182,7 @@
 
         @Override public void characters(char[] ch, int start, int length) {
-            /** 
+            /**
              * Remove illegal characters generated by the Nokia Sports Tracker device.
-             * Don't do this crude substitution for all files, since it would destroy 
+             * Don't do this crude substitution for all files, since it would destroy
              * certain unicode characters.
              */
Index: trunk/src/org/openstreetmap/josm/io/IllegalDataException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/IllegalDataException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/IllegalDataException.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java	(revision 2512)
@@ -56,5 +56,4 @@
     static private int MAX_IDS_PER_REQUEST = 200;
 
-
     private HashSet nodes;
     private HashSet ways;
@@ -254,5 +253,4 @@
         return pkg;
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/MultiPartFormOutputStream.java	(revision 2512)
@@ -14,5 +14,4 @@
       list of conditions and the following disclaimer in the documentation and/or other
       materials provided with the distribution.
-
 
 Neither the name of Sun Microsystems, Inc. or the names of contributors may be used to
@@ -43,5 +42,4 @@
 import java.net.URL;
 import java.net.URLConnection;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/io/OsmApi.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmApi.java	(revision 2512)
@@ -296,12 +296,11 @@
     }
 
-
     /**
      * Creates a new changeset based on the keys in changeset. If this
      * method succeeds, changeset.getId() replies the id the server assigned to the new
      * changeset
-     * 
+     *
      * The changeset must not be null, but its key/value-pairs may be empty.
-     * 
+     *
      * @param changeset the changeset toe be created. Must not be null.
      * @param progressMonitor the progress monitor
@@ -335,9 +334,9 @@
      * @param changeset the changeset to update. Must not be null.
      * @param monitor the progress monitor. If null, uses the {@see NullProgressMonitor#INSTANCE}.
-     * 
+     *
      * @throws OsmTransferException if something goes wrong.
      * @throws IllegalArgumentException if changeset is null
      * @throws IllegalArgumentException if changeset.getId() <= 0
-     * 
+     *
      */
     public void updateChangeset(Changeset changeset, ProgressMonitor monitor) throws OsmTransferException {
@@ -368,5 +367,4 @@
     }
 
-
     /**
      * Closes a changeset on the server. Sets changeset.setOpen(false) if this operation
@@ -375,5 +373,5 @@
      * @param changeset the changeset to be closed. Must not be null. changeset.getId() > 0 required.
      * @param monitor the progress monitor. If null, uses {@see NullProgressMonitor#INSTANCE}
-     * 
+     *
      * @throws OsmTransferException if something goes wrong.
      * @throws IllegalArgumentException thrown if changeset is null
@@ -455,5 +453,5 @@
     /**
      * Replies the max. number of retries in case of 5XX errors on the server
-     * 
+     *
      * @return the max number of retries
      */
@@ -603,8 +601,7 @@
     }
 
-
     /**
      * Ensures that the current changeset can be used for uploading data
-     * 
+     *
      * @throws OsmTransferException thrown if the current changeset can't be used for
      * uploading data
@@ -618,5 +615,5 @@
     /**
      * Replies the changeset data uploads are currently directed to
-     * 
+     *
      * @return the changeset data uploads are currently directed to
      */
@@ -629,5 +626,5 @@
      * can be null. If it isn't null it must have been created, i.e. id > 0 is required. Furthermore,
      * it must be open.
-     * 
+     *
      * @param changeset the changeset
      * @throws IllegalArgumentException thrown if changeset.getId() <= 0
Index: trunk/src/org/openstreetmap/josm/io/OsmApiException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApiException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmApiException.java	(revision 2512)
@@ -78,5 +78,5 @@
     /**
      * Replies a message suitable to be displayed in a message dialog
-     * 
+     *
      * @return a message which is suitable to be displayed in a message dialog
      */
Index: trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmApiInitializationException.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmApiPrimitiveGoneException.java	(revision 2512)
@@ -11,5 +11,5 @@
  * Represents an exception thrown by the OSM API if JOSM tries to update or delete a primitive
  * which is already deleted on the server.
- * 
+ *
  */
 public class OsmApiPrimitiveGoneException extends OsmApiException{
@@ -22,5 +22,4 @@
     /** the id of the primitive */
     private long id;
-
 
     public OsmApiPrimitiveGoneException(String errorHeader, String errorBody) {
@@ -37,5 +36,5 @@
     /**
      * Replies true if we know what primitive this exception was thrown for
-     * 
+     *
      * @return true if we know what primitive this exception was thrown for
      */
@@ -47,5 +46,5 @@
      * Replies the type of the primitive this exception was thrown for. null,
      * if the type is not known.
-     * 
+     *
      * @return the type of the primitive this exception was thrown for
      */
@@ -57,5 +56,5 @@
      * Replies the id of the primitive this exception was thrown for. 0, if
      * the id is not known.
-     * 
+     *
      * @return the id of the primitive this exception was thrown for
      */
Index: trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmChangesetParser.java	(revision 2512)
@@ -203,8 +203,8 @@
     /**
      * Parse the given input source and return the list of changesets
-     * 
+     *
      * @param source the source input stream
      * @param progressMonitor  the progress monitor
-     * 
+     *
      * @return the list of changesets
      * @throws IllegalDataException thrown if the an error was found while parsing the data from the source
Index: trunk/src/org/openstreetmap/josm/io/OsmConnection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmConnection.java	(revision 2512)
@@ -132,5 +132,5 @@
     /**
      * Replies true if this connection is canceled
-     * 
+     *
      * @return true if this connection is canceled
      * @return
Index: trunk/src/org/openstreetmap/josm/io/OsmDataParsingException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmDataParsingException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmDataParsingException.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmHistoryReader.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/OsmReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmReader.java	(revision 2512)
@@ -50,5 +50,5 @@
     /**
      * Replies the parsed data set
-     * 
+     *
      * @return the parsed data set
      */
@@ -60,5 +60,5 @@
      * longs too, but in contrast to internal ids negative values are used
      * to identify primitives unknown to the OSM server
-     * 
+     *
      * The keys are strings composed as follows
      * 
        
@@ -69,5 +69,4 @@
      */
     private Map externalIdMap = new HashMap();
-
 
     /**
@@ -171,5 +170,4 @@
         private OsmPrimitiveData current;
         private String generator;
-
 
         @Override public void startElement(String namespaceURI, String localName, String qName, Attributes atts) throws SAXException {
@@ -410,9 +408,8 @@
     }
 
-
     /**
      * Processes the ways after parsing. Rebuilds the list of nodes of each way and
      * adds the way to the dataset
-     * 
+     *
      * @throws IllegalDataException thrown if a data integrity problem is detected
      */
@@ -460,5 +457,5 @@
      * Processes the parsed nodes after parsing. Just adds them to
      * the dataset
-     * 
+     *
      */
     protected void processNodesAfterParsing() {
@@ -472,8 +469,8 @@
     /**
      * Completes the parsed relations with its members.
-     * 
+     *
      * @throws IllegalDataException thrown if a data integrity problem is detected, i.e. if a
      * relation member refers to a local primitive which wasn't available in the data
-     * 
+     *
      */
     private void processRelationsAfterParsing() throws IllegalDataException {
@@ -545,8 +542,8 @@
     /**
      * Parse the given input source and return the dataset.
-     * 
+     *
      * @param source the source input stream
      * @param progressMonitor  the progress monitor
-     * 
+     *
      * @return the dataset with the parsed data
      * @throws IllegalDataException thrown if the an error was found while parsing the data from the source
Index: trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerBackreferenceReader.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java	(revision 2512)
@@ -69,5 +69,5 @@
     /**
      * Reads teh changeset with id id from the server
-     * 
+     *
      * @param id  the changeset id. id > 0 required.
      * @param monitor the progress monitor. Set to {@see NullProgressMonitor#INSTANCE} if null
@@ -105,5 +105,5 @@
     /**
      * not implemented yet
-     * 
+     *
      * @param id
      * @param monitor
Index: trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/OsmServerReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerReader.java	(revision 2512)
@@ -135,5 +135,5 @@
      * Returns true if this reader is adding authentication credentials to the read
      * request sent to the server.
-     * 
+     *
      * @return true if this reader is adding authentication credentials to the read
      * request sent to the server
@@ -146,5 +146,5 @@
      * Sets whether this reader adds authentication credentials to the read
      * request sent to the server.
-     * 
+     *
      * @param doAuthenticate  true if  this reader adds authentication credentials to the read
      * request sent to the server
Index: trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerUserInfoReader.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java
===================================================================
--- trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java	(revision 2512)
@@ -64,5 +64,5 @@
     /**
      * Uploads the changes individually. Invokes one API call per uploaded primitmive.
-     * 
+     *
      * @param primitives the collection of primitives to upload
      * @param progressMonitor the progress monitor
@@ -106,5 +106,5 @@
     /**
      * Upload all changes in one diff upload
-     * 
+     *
      * @param primitives the collection of primitives to upload
      * @param progressMonitor  the progress monitor
@@ -193,5 +193,5 @@
     /**
      * Replies the collection of successfully processed primitives
-     * 
+     *
      * @return the collection of successfully processed primitives
      */
Index: trunk/src/org/openstreetmap/josm/plugins/PluginException.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginException.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginException.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginInformation.java	(revision 2512)
@@ -274,3 +274,2 @@
     }
 }
-
Index: trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java
===================================================================
--- trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java	(revision 2512)
@@ -300,5 +300,5 @@
             if (!name_lc.contains(lc_bit) &&
                 !description_lc.contains(lc_bit) &&
-                !remoteversion_lc.contains(lc_bit) && 
+                !remoteversion_lc.contains(lc_bit) &&
                 !localversion_lc.contains(lc_bit)) {
                 canHas = false;
Index: trunk/src/org/openstreetmap/josm/tools/AudioUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/AudioUtil.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/AudioUtil.java	(revision 2512)
Index: trunk/src/org/openstreetmap/josm/tools/CopyList.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/CopyList.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/CopyList.java	(revision 2512)
@@ -98,5 +98,4 @@
     }
 
-
     // speed optimizations:
     public @Override boolean add(E element) {
Index: trunk/src/org/openstreetmap/josm/tools/DateParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/DateParser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/DateParser.java	(revision 2512)
@@ -4,5 +4,4 @@
 import java.text.ParseException;
 import java.util.Date;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/tools/DateUtils.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/DateUtils.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/DateUtils.java	(revision 2512)
@@ -29,5 +29,4 @@
 import javax.xml.datatype.DatatypeFactory;
 import javax.xml.datatype.XMLGregorianCalendar;
-
 
 /**
Index: trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java	(revision 2512)
@@ -46,5 +46,5 @@
      * Explains a precondition exception when a child relation could not be deleted because
      * it is still referred to by an undeleted parent relation.
-     * 
+     *
      * @param e the exception
      * @param childRelation the child relation
@@ -142,5 +142,5 @@
      * Explains an exception thrown during upload because the changeset which data is
      * uploaded to is already closed.
-     * 
+     *
      * @param e the exception
      */
@@ -160,5 +160,5 @@
     /**
      * Explains an exception with a generic message dialog
-     * 
+     *
      * @param e the exception
      */
@@ -176,5 +176,5 @@
      * This is most likely happening when user tries to access the OSM API from within an
      * applet which wasn't loaded from the API server.
-     * 
+     *
      * @param e the exception
      */
@@ -199,5 +199,5 @@
      * This is most likely because there's not connection to the Internet or because
      * the remote server is not reachable.
-     * 
+     *
      * @param e the exception
      */
@@ -215,5 +215,5 @@
      * This is most likely happening when the communication with the remote server is
      * interrupted for any reason.
-     * 
+     *
      * @param e the exception
      */
@@ -232,5 +232,5 @@
      * Explains a {@see OsmApiException} which was thrown because of an internal server
      * error in the OSM API server..
-     * 
+     *
      * @param e the exception
      */
@@ -247,5 +247,5 @@
      * Explains a {@see OsmApiException} which was thrown because of a bad
      * request
-     * 
+     *
      * @param e the exception
      */
@@ -267,5 +267,5 @@
     /**
      * Explains a {@see OsmApiException} which was thrown because a resource wasn't found.
-     * 
+     *
      * @param e the exception
      */
@@ -286,5 +286,5 @@
      * This is most likely happening when there is an error in the API URL or when
      * local DNS services are not working.
-     * 
+     *
      * @param e the exception
      */
@@ -309,5 +309,5 @@
      * Replies the first nested exception of type nestedClass (including
      * the root exception e) or null, if no such exception is found.
-     * 
+     *
      * @param 
      * @param e the root exception
@@ -330,5 +330,5 @@
     /**
      * Explains an {@see OsmTransferException} to the user.
-     * 
+     *
      * @param e the {@see OsmTransferException}
      */
@@ -383,5 +383,5 @@
     /**
      * Explains an {@see Exception} to the user.
-     * 
+     *
      * @param e the {@see Exception}
      */
Index: trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/FallbackDateParser.java	(revision 2512)
@@ -7,5 +7,4 @@
 import java.util.Date;
 import java.util.List;
-
 
 /**
@@ -34,8 +33,6 @@
     };
 
-
     private List dateParsers;
     private int activeDateParser;
-
 
     /**
@@ -52,5 +49,4 @@
         activeDateParser = -1;
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/I18n.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/I18n.java	(revision 2512)
@@ -135,8 +135,8 @@
      * Sets the default locale (see {@see Locale#setDefault(Locale)} to the local
      * given by localName.
-     * 
+     *
      * Ignored if localName is null. If the locale with name localName
      * isn't found the default local is set to en (english).
-     * 
+     *
      * @param localeName the locale name. Ignored if null.
      */
Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java	(revision 2512)
@@ -61,5 +61,5 @@
     /**
      * Return an image from the specified location.
-     * 
+     *
      * @param subdir The position of the directory, e.g. "layer"
      * @param name The icons name (without the ending of ".png")
@@ -277,5 +277,5 @@
     /**
      * Creates a rotated version of the input image.
-     * 
+     *
      * @param c The component to get properties useful for painting, e.g. the foreground or
      * background color.
@@ -283,5 +283,5 @@
      * @param rotatedAngle the rotated angle, in degree, clockwise. It could be any double but we
      * will mod it with 360 before using it.
-     * 
+     *
      * @return the image after rotating.
      */
Index: trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/LanguageInfo.java	(revision 2512)
@@ -11,5 +11,5 @@
      * prefix has the form 'Xy:' where 'Xy' is a ISO 639 language code in title
      * case.
-     * 
+     *
      * @param locale  the locale
      * @return the wiki language prefix
@@ -30,5 +30,5 @@
     /**
      * Replies the wiki language prefix for the current locale.
-     * 
+     *
      * @return the wiki language prefix
      * @see Locale#getDefault()
@@ -41,5 +41,5 @@
     /**
      * Replies the JOSM locale code for the default locale.
-     * 
+     *
      * @return the JOSM locale code for the default locale
      * @see #getJOSMLocaleCode(Locale)
@@ -51,9 +51,9 @@
     /**
      * Replies the local code used by JOSM for a given locale.
-     * 
+     *
      * In most cases JOSM uses the 2-character ISO 639 language code ({@see Locale#getLanguage()}
      * to identify the locale of a localized resource, but in some cases it may use the
      * programmatic name for locales, as replied by {@see Locale#toString()}.
-     * 
+     *
      * @param locale the locale. Replies "en" if null.
      * @return the JOSM code for the given locale
@@ -71,5 +71,4 @@
     }
 
-
     static public String getLanguageCodeXML()
     {
Index: trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/OsmUrlToBounds.java	(revision 2512)
@@ -8,5 +8,5 @@
 
 public class OsmUrlToBounds {
-    
+
     public static Bounds parse(String url) {
         int i = url.indexOf('?');
Index: trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/PresetTextComparator.java	(revision 2512)
@@ -11,4 +11,3 @@
     }
 
-
 }
Index: trunk/src/org/openstreetmap/josm/tools/PrimaryDateParser.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PrimaryDateParser.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/PrimaryDateParser.java	(revision 2512)
@@ -9,5 +9,4 @@
 import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
-
 
 /**
@@ -23,5 +22,4 @@
     private Calendar calendar;
 
-
     /**
      * Creates a new instance.
@@ -41,5 +39,4 @@
     }
 
-
     private boolean isDateInShortStandardFormat(String date) {
         char[] dateChars;
@@ -109,5 +106,4 @@
     }
 
-
     private boolean isDateInLongStandardFormat(String date) {
         char[] dateChars;
@@ -184,5 +180,4 @@
         return true;
     }
-
 
     private Date parseShortStandardDate(String date) {
@@ -211,5 +206,4 @@
         return calendar.getTime();
     }
-
 
     private Date parseLongStandardDate(String date) {
@@ -241,5 +235,4 @@
         return calendar.getTime();
     }
-
 
     /**
Index: trunk/src/org/openstreetmap/josm/tools/UrlLabel.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/UrlLabel.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/UrlLabel.java	(revision 2512)
@@ -51,5 +51,5 @@
      * Sets the URL to be visited if the user clicks on this URL label. If null, the
      * label turns into a normal label without hyperlink.
-     * 
+     *
      * @param url the url. Can be null.
      */
@@ -61,5 +61,5 @@
     /**
      * Sets the text part of the URL label. Defaults to the empty string if description is null.
-     * 
+     *
      * @param description the description
      */
Index: trunk/src/org/openstreetmap/josm/tools/WikiReader.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/WikiReader.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/WikiReader.java	(revision 2512)
@@ -14,5 +14,5 @@
 /**
  * Read a trac-wiki page.
- * 
+ *
  * @author imi
  */
@@ -31,8 +31,8 @@
     /**
      * Read the page specified by the url and return the content.
-     * 
+     *
      * If the url is within the baseurl path, parse it as an trac wikipage and replace relative
      * pathes etc..
-     * 
+     *
      * @return
      * @throws IOException Throws, if the page could not be loaded.
Index: trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 2511)
+++ trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java	(revision 2512)
@@ -20,5 +20,5 @@
  * This is a helper class for persisting the geometry of a JOSM window to the preference store
  * and for restoring it from the preference store.
- * 
+ *
  */
 public class WindowGeometry {
@@ -27,5 +27,5 @@
      * Replies a window geometry object for a window with a specific size which is
      * centered on screen
-     * 
+     *
      * @param extent  the size
      * @return the geometry object
@@ -42,5 +42,5 @@
      * Replies a window geometry object for a window which a specific size which is centered
      * relative to a parent window
-     * 
+     *
      * @param parent the parent window
      * @param extent the size
@@ -60,5 +60,5 @@
     /**
      * Exception thrown by the WindowGeometry class if something goes wrong
-     * 
+     *
      */
     static public class WindowGeometryException extends Exception {
@@ -78,5 +78,5 @@
 
     /**
-     * 
+     *
      * @param topLeft the top left point
      * @param extent the extent
@@ -89,5 +89,5 @@
     /**
      * Creates a window geometry from the position and the size of a window.
-     * 
+     *
      * @param window the window
      */
@@ -134,5 +134,5 @@
      * Creates a window geometry from the values kept in the preference store under the
      * key preferenceKey
-     * 
+     *
      * @param preferenceKey the preference key
      * @throws WindowGeometryException thrown if no such key exist or if the preference value has
@@ -147,8 +147,8 @@
      * key preferenceKey. Falls back to the defaultGeometry if
      * something goes wrong.
-     * 
+     *
      * @param preferenceKey the preference key
      * @param defaultGeometry the default geometry
-     * 
+     *
      */
     public WindowGeometry(String preferenceKey, WindowGeometry defaultGeometry) {
@@ -163,5 +163,5 @@
     /**
      * Remembers a window geometry under a specific preference key
-     * 
+     *
      * @param preferenceKey the preference key
      */
@@ -177,5 +177,5 @@
     /**
      * Replies the top left point for the geometry
-     * 
+     *
      * @return  the top left point for the geometry
      */
@@ -186,5 +186,5 @@
     /**
      * Replies the size spezified by the geometry
-     * 
+     *
      * @return the size spezified by the geometry
      */
@@ -195,5 +195,5 @@
     /**
      * Applies this geometry to a window
-     * 
+     *
      * @param window the window
      */
@@ -206,5 +206,5 @@
      * Applies this geometry to a window. Makes sure that the window is not placed outside
      * of the coordinate range of the current screen.
-     * 
+     *
      * @param window the window
      */