Index: /trunk/src/org/openstreetmap/josm/data/Preferences.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/data/Preferences.java (revision 8557) @@ -1365,5 +1365,5 @@ if (value instanceof JsonString) { // in some cases, when JsonValue.toString() is called, then additional quotation marks are left in value - ret.put(e.getKey(), ((JsonString)value).getString()); + ret.put(e.getKey(), ((JsonString) value).getString()); } else { ret.put(e.getKey(), e.getValue().toString()); Index: /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java (revision 8557) @@ -50,4 +50,5 @@ * @param en2 The instance to subtract this one from. * @return The new EastNorth position. + * @deprecated use {@code subtract} on the other EastNorth instead */ @Deprecated Index: /trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 8557) @@ -53,4 +53,5 @@ import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors; +import org.openstreetmap.josm.data.osm.visitor.paint.Rendering; import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache; import org.openstreetmap.josm.gui.layer.GpxLayer; @@ -350,5 +351,5 @@ MapScaler scaler = new MapScaler(forMapView); - scaler.setLocation(10,30); + scaler.setLocation(10, 30); return Arrays.asList(zoomSlider, scaler); @@ -691,5 +692,5 @@ ); Collections.reverse(ret); - return ret; + return ret; } finally { layerLock.readLock().unlock(); @@ -966,5 +967,5 @@ private OsmDataLayer findNewEditLayer(List layersList) { - OsmDataLayer newEditLayer = layersList.contains(editLayer)?editLayer:null; + OsmDataLayer newEditLayer = layersList.contains(editLayer) ? editLayer : null; // Find new edit layer if (activeLayer != editLayer || !layersList.contains(editLayer)) { @@ -1014,5 +1015,5 @@ * @param layer The layer to be active. * @param setEditLayer if this is true, the edit layer is also set. - * @return + * @return {@code true} if the active layer has changed, {@code false otherwise} */ private boolean setActiveLayer(final Layer layer, boolean setEditLayer) { @@ -1023,5 +1024,4 @@ return false; - Layer old = activeLayer; activeLayer = layer; if (setEditLayer) { @@ -1054,5 +1054,5 @@ * order. This way it works as visual clue for new users */ for (final AbstractButton b: Main.map.allMapModeButtons) { - MapMode mode = (MapMode)b.getAction(); + MapMode mode = (MapMode) b.getAction(); final boolean activeLayerSupported = mode.layerIsSupported(activeLayer); if (activeLayerSupported) { @@ -1272,5 +1272,6 @@ @Override public void repaint(long tm, int x, int y, int width, int height) { - // This is the main repaint method, all other methods are convenience methods and simply call this method. This is just an observation, not a must, but seems to be true for all implementations I found so far. + // This is the main repaint method, all other methods are convenience methods and simply call this method. + // This is just an observation, not a must, but seems to be true for all implementations I found so far. if (repaintListeners != null) { // Might get called early in super constructor Index: /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java (revision 8557) @@ -78,4 +78,5 @@ * Interface to notify listeners of the change of the system of measurement. * @since 6056 + * @deprecated use {@link org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener} instead. */ @Deprecated @@ -135,8 +136,9 @@ /** - * Removes a SoM change listener + * Removes a SoM change listener. * * @param listener the listener. Ignored if null or already absent * @since 6056 + * @deprecated use {@link SystemOfMeasurement#removeSoMChangeListener} instead. */ @Deprecated @@ -150,4 +152,5 @@ * @param listener the listener. Ignored if null or already registered. * @since 6056 + * @deprecated use {@link SystemOfMeasurement#addSoMChangeListener} instead. */ @Deprecated @@ -160,4 +163,5 @@ * @return The current system of measurement (metric system by default). * @since 3490 + * @deprecated use {@link SystemOfMeasurement#getSoMChangeListener} instead. */ @Deprecated @@ -171,4 +175,5 @@ * @throws IllegalArgumentException if {@code somKey} is not known * @since 6056 + * @deprecated use {@link SystemOfMeasurement#setSoMChangeListener} instead. */ @Deprecated @@ -189,5 +194,5 @@ protected transient ViewportData initialViewport; - protected transient final CursorManager cursorManager = new CursorManager(this); + protected final transient CursorManager cursorManager = new CursorManager(this); /** Index: /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/gui/SelectionManager.java (revision 8557) @@ -332,5 +332,5 @@ @Override public void propertyChange(PropertyChangeEvent evt) { - if ("active".equals(evt.getPropertyName()) && !(Boolean)evt.getNewValue()) { + if ("active".equals(evt.getPropertyName()) && !(Boolean) evt.getNewValue()) { abortSelecting(); } @@ -338,5 +338,6 @@ /** - * Stores the current selection and stores the result in {@link #selectionResult} to be retrieved by {@link #getSelectedObjects(boolean)} later. + * Stores the current selection and stores the result in {@link #selectionResult} to be retrieved by + * {@link #getSelectedObjects(boolean)} later. * @param e The mouse event that caused the selection to be finished. */ Index: /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 8557) @@ -34,5 +34,4 @@ import org.openstreetmap.josm.data.projection.Projection; import org.openstreetmap.josm.gui.MapView; -import org.openstreetmap.josm.gui.NavigatableComponent; import org.openstreetmap.josm.gui.dialogs.LayerListDialog; import org.openstreetmap.josm.gui.dialogs.LayerListPopup; Index: /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 8556) +++ /trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 8557) @@ -45,6 +45,4 @@ * @param info ImageryInfo description of the layer */ - - public WMSLayer(ImageryInfo info) { super(info); @@ -150,6 +148,4 @@ ((TemplatedWMSTileSource) tileSource).initProjection(newValue); } - } - }