Changeset 8557 in josm

Timestamp:

2015-07-01T22:45:13+02:00 (9 years ago)

Author:

Don-vip

Message:

checkstyle

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/Preferences.java (modified) (1 diff)
• data/coor/EastNorth.java (modified) (1 diff)
• gui/MapView.java (modified) (8 diffs)
• gui/NavigatableComponent.java (modified) (6 diffs)
• gui/SelectionManager.java (modified) (2 diffs)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/layer/WMSLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -1365 +1365 @@
                 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());

trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

@@ -50 +50 @@
      * @param en2 The instance to subtract this one from.
      * @return The new EastNorth position.
+     * @deprecated use {@code subtract} on the other EastNorth instead
      */
     @Deprecated

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -53 +53 @@
 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 +351 @@
 
         MapScaler scaler = new MapScaler(forMapView);
-        scaler.setLocation(10,30);
+        scaler.setLocation(10, 30);
 
         return Arrays.asList(zoomSlider, scaler);
@@ -691 +692 @@
             );
             Collections.reverse(ret);
-            return ret;            
+            return ret;
         } finally {
             layerLock.readLock().unlock();
@@ -966 +967 @@
 
     private OsmDataLayer findNewEditLayer(List<Layer> 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 +1015 @@
      * @param layer The layer to be active.
      * @param setEditLayer if this is <code>true</code>, 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 +1024 @@
             return false;
 
-        Layer old = activeLayer;
         activeLayer = layer;
         if (setEditLayer) {
@@ -1054 +1054 @@
          * 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 +1272 @@
     @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

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -78 +78 @@
      * 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 +136 @@
 
     /**
-     * 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 +152 @@
      * @param listener the listener. Ignored if null or already registered.
      * @since 6056
+     * @deprecated use {@link SystemOfMeasurement#addSoMChangeListener} instead.
      */
     @Deprecated
@@ -160 +163 @@
      * @return The current system of measurement (metric system by default).
      * @since 3490
+     * @deprecated use {@link SystemOfMeasurement#getSoMChangeListener} instead.
      */
     @Deprecated
@@ -171 +175 @@
      * @throws IllegalArgumentException if {@code somKey} is not known
      * @since 6056
+     * @deprecated use {@link SystemOfMeasurement#setSoMChangeListener} instead.
      */
     @Deprecated
@@ -189 +194 @@
     protected transient ViewportData initialViewport;
 
-    protected transient final CursorManager cursorManager = new CursorManager(this);
+    protected final transient CursorManager cursorManager = new CursorManager(this);
 
     /**

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -332 +332 @@
     @Override
     public void propertyChange(PropertyChangeEvent evt) {
-        if ("active".equals(evt.getPropertyName()) && !(Boolean)evt.getNewValue()) {
+        if ("active".equals(evt.getPropertyName()) && !(Boolean) evt.getNewValue()) {
             abortSelecting();
         }
@@ -338 +338 @@
 
     /**
-     * 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.
      */

trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

@@ -34 +34 @@
 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;

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -45 +45 @@
      * @param info ImageryInfo description of the layer
      */
-
-
     public WMSLayer(ImageryInfo info) {
         super(info);
@@ -150 +148 @@
             ((TemplatedWMSTileSource) tileSource).initProjection(newValue);
         }
-
     }
-
 }