Changeset 8557 in josm


Ignore:
Timestamp:
2015-07-01T22:45:13+02:00 (5 years ago)
Author:
Don-vip
Message:

checkstyle

Location:
trunk/src/org/openstreetmap/josm
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/Preferences.java

    r8541 r8557  
    13651365                if (value instanceof JsonString) {
    13661366                    // in some cases, when JsonValue.toString() is called, then additional quotation marks are left in value
    1367                     ret.put(e.getKey(), ((JsonString)value).getString());
     1367                    ret.put(e.getKey(), ((JsonString) value).getString());
    13681368                } else {
    13691369                    ret.put(e.getKey(), e.getValue().toString());
  • trunk/src/org/openstreetmap/josm/data/coor/EastNorth.java

    r8549 r8557  
    5050     * @param en2 The instance to subtract this one from.
    5151     * @return The new EastNorth position.
     52     * @deprecated use {@code subtract} on the other EastNorth instead
    5253     */
    5354    @Deprecated
  • trunk/src/org/openstreetmap/josm/gui/MapView.java

    r8555 r8557  
    5353import org.openstreetmap.josm.data.osm.OsmPrimitive;
    5454import org.openstreetmap.josm.data.osm.visitor.paint.PaintColors;
     55import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
    5556import org.openstreetmap.josm.data.osm.visitor.paint.relations.MultipolygonCache;
    5657import org.openstreetmap.josm.gui.layer.GpxLayer;
     
    350351
    351352        MapScaler scaler = new MapScaler(forMapView);
    352         scaler.setLocation(10,30);
     353        scaler.setLocation(10, 30);
    353354
    354355        return Arrays.asList(zoomSlider, scaler);
     
    691692            );
    692693            Collections.reverse(ret);
    693             return ret;           
     694            return ret;
    694695        } finally {
    695696            layerLock.readLock().unlock();
     
    966967
    967968    private OsmDataLayer findNewEditLayer(List<Layer> layersList) {
    968         OsmDataLayer newEditLayer = layersList.contains(editLayer)?editLayer:null;
     969        OsmDataLayer newEditLayer = layersList.contains(editLayer) ? editLayer : null;
    969970        // Find new edit layer
    970971        if (activeLayer != editLayer || !layersList.contains(editLayer)) {
     
    10141015     * @param layer The layer to be active.
    10151016     * @param setEditLayer if this is <code>true</code>, the edit layer is also set.
    1016      * @return
     1017     * @return {@code true} if the active layer has changed, {@code false otherwise}
    10171018     */
    10181019    private boolean setActiveLayer(final Layer layer, boolean setEditLayer) {
     
    10231024            return false;
    10241025
    1025         Layer old = activeLayer;
    10261026        activeLayer = layer;
    10271027        if (setEditLayer) {
     
    10541054         * order. This way it works as visual clue for new users */
    10551055        for (final AbstractButton b: Main.map.allMapModeButtons) {
    1056             MapMode mode = (MapMode)b.getAction();
     1056            MapMode mode = (MapMode) b.getAction();
    10571057            final boolean activeLayerSupported = mode.layerIsSupported(activeLayer);
    10581058            if (activeLayerSupported) {
     
    12721272    @Override
    12731273    public void repaint(long tm, int x, int y, int width, int height) {
    1274         // 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.
     1274        // This is the main repaint method, all other methods are convenience methods and simply call this method.
     1275        // This is just an observation, not a must, but seems to be true for all implementations I found so far.
    12751276        if (repaintListeners != null) {
    12761277            // Might get called early in super constructor
  • trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

    r8556 r8557  
    7878     * Interface to notify listeners of the change of the system of measurement.
    7979     * @since 6056
     80     * @deprecated use {@link org.openstreetmap.josm.data.SystemOfMeasurement.SoMChangeListener} instead.
    8081     */
    8182    @Deprecated
     
    135136
    136137    /**
    137      * Removes a SoM change listener
     138     * Removes a SoM change listener.
    138139     *
    139140     * @param listener the listener. Ignored if null or already absent
    140141     * @since 6056
     142     * @deprecated use {@link SystemOfMeasurement#removeSoMChangeListener} instead.
    141143     */
    142144    @Deprecated
     
    150152     * @param listener the listener. Ignored if null or already registered.
    151153     * @since 6056
     154     * @deprecated use {@link SystemOfMeasurement#addSoMChangeListener} instead.
    152155     */
    153156    @Deprecated
     
    160163     * @return The current system of measurement (metric system by default).
    161164     * @since 3490
     165     * @deprecated use {@link SystemOfMeasurement#getSoMChangeListener} instead.
    162166     */
    163167    @Deprecated
     
    171175     * @throws IllegalArgumentException if {@code somKey} is not known
    172176     * @since 6056
     177     * @deprecated use {@link SystemOfMeasurement#setSoMChangeListener} instead.
    173178     */
    174179    @Deprecated
     
    189194    protected transient ViewportData initialViewport;
    190195
    191     protected transient final CursorManager cursorManager = new CursorManager(this);
     196    protected final transient CursorManager cursorManager = new CursorManager(this);
    192197
    193198    /**
  • trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

    r8550 r8557  
    332332    @Override
    333333    public void propertyChange(PropertyChangeEvent evt) {
    334         if ("active".equals(evt.getPropertyName()) && !(Boolean)evt.getNewValue()) {
     334        if ("active".equals(evt.getPropertyName()) && !(Boolean) evt.getNewValue()) {
    335335            abortSelecting();
    336336        }
     
    338338
    339339    /**
    340      * Stores the  current selection and stores the result in {@link #selectionResult} to  be retrieved by {@link #getSelectedObjects(boolean)} later.
     340     * Stores the  current selection and stores the result in {@link #selectionResult} to  be retrieved by
     341     * {@link #getSelectedObjects(boolean)} later.
    341342     * @param e The mouse event that caused the selection to be finished.
    342343     */
  • trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java

    r8554 r8557  
    3434import org.openstreetmap.josm.data.projection.Projection;
    3535import org.openstreetmap.josm.gui.MapView;
    36 import org.openstreetmap.josm.gui.NavigatableComponent;
    3736import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
    3837import org.openstreetmap.josm.gui.dialogs.LayerListPopup;
  • trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

    r8543 r8557  
    4545     * @param info ImageryInfo description of the layer
    4646     */
    47 
    48 
    4947    public WMSLayer(ImageryInfo info) {
    5048        super(info);
     
    150148            ((TemplatedWMSTileSource) tileSource).initProjection(newValue);
    151149        }
    152 
    153150    }
    154 
    155151}
Note: See TracChangeset for help on using the changeset viewer.