Changeset 6378 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2013-11-08T01:39:06+01:00 (10 years ago)

Author:

Don-vip

Message:

Sonar/Findbugs - fix various violations, javadoc

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/JoinAreasAction.java (modified) (2 diffs)
• data/validation/FixableTestError.java (modified) (2 diffs)
• data/validation/TestError.java (modified) (2 diffs)
• data/validation/tests/OpeningHourTest.java (modified) (1 diff)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (3 diffs)
• gui/download/BookmarkList.java (modified) (1 diff)
• gui/mappaint/MapImage.java (modified) (1 diff)
• gui/preferences/SourceEditor.java (modified) (1 diff)
• gui/preferences/map/MapPaintPreference.java (modified) (2 diffs)
• gui/preferences/map/TaggingPresetPreference.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -72 +72 @@
         public List<Way> innerWays;
 
-        public Relation relation;
-
         public Multipolygon(Way way) {
             outerWay = way;
@@ -1278 +1276 @@
             Multipolygon pol = new Multipolygon(outerWay);
             pol.innerWays.addAll(innerWays);
-            pol.relation = r;
 
             result.add(pol);

trunk/src/org/openstreetmap/josm/data/validation/FixableTestError.java

@@ +1 @@
+// License: GPL. See LICENSE file for details.
 package org.openstreetmap.josm.data.validation;
 
@@ -6 +7 @@
 import java.util.Collection;
 
+/**
+ * Validation error easily fixable right at its detection. The fix can be given when constructing the error.
+ * @since 6377
+ */
 public class FixableTestError extends TestError {
     protected final Command fix;

trunk/src/org/openstreetmap/josm/data/validation/TestError.java

@@ -28 +28 @@
 /**
  * Validation error
- * @author frsantos
+ * @since 3669
  */
 public class TestError implements Comparable<TestError>, DataSetListener {
@@ -52 +52 @@
 
     /**
-     * Constructors
+     * Constructs a new {@code TestError}.
      * @param tester The tester
      * @param severity The severity of this error

trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java

@@ -164 +164 @@
             try {
                 prettifiedValue = (String) ((Invocable) ENGINE).invokeMethod(r, "prettifyValue");
-            } catch (Exception ignore) {
+            } catch (Exception e) {
+                Main.debug(e.getMessage());
             }
             for (final Object i : getList(((Invocable) ENGINE).invokeMethod(r, "getWarnings"))) {

trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java

@@ -200 +200 @@
         setMaxTilesInMemory(Main.pref.getInteger("slippy_map_chooser.max_tiles", 1000));
 
-        List<TileSource> tileSources = getTileSources();
+        List<TileSource> tileSources = getAllTileSources();
 
         iSourceButton = new SourceButton(tileSources);
@@ -222 +222 @@
     }
     
-    private final List<TileSource> getTileSources() {
+    private List<TileSource> getAllTileSources() {
         List<TileSource> tileSources = new ArrayList<TileSource>();
         for (TileSourceProvider provider: providers) {
@@ -400 +400 @@
      */
     public final void refreshTileSources() {
-        iSourceButton.setSources(getTileSources());
+        iSourceButton.setSources(getAllTileSources());
     }
 }

trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java

@@ -239 +239 @@
      * Saves all bookmarks to the preferences file
      */
-    public void save() {
+    public final void save() {
         LinkedList<Collection<String>> coll = new LinkedList<Collection<String>>();
         for (Object o : ((DefaultListModel)getModel()).toArray()) {

trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java

@@ -121 +121 @@
             int w = getWidth(), h = getHeight();
             if (mustRescale(getImage())) {
-                w = h = 16;
+                w = 16;
+                h = 16;
             }
             return new Rectangle(-w/2, -h/2, w, h);

trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java

@@ -1502 +1502 @@
         private final String pref;
 
-        public SourcePrefHelper(String pref, String prefOld) {
+        public SourcePrefHelper(String pref) {
             this.pref = pref;
         }

trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java

@@ -170 +170 @@
             MapPaintStyles.readFromPreferences();
         }
-        if (Main.isDisplayingMapView())
-        {
+        if (Main.isDisplayingMapView()) {
             MapPaintStyles.getStyles().clearCached();
         }
@@ -186 +185 @@
     public static class MapPaintPrefHelper extends SourceEditor.SourcePrefHelper {
 
+        /**
+         * The unique instance.
+         */
         public final static MapPaintPrefHelper INSTANCE = new MapPaintPrefHelper();
 
+        /**
+         * Constructs a new {@code MapPaintPrefHelper}.
+         */
         public MapPaintPrefHelper() {
-            super("mappaint.style.entries", "mappaint.style.sources-list");
+            super("mappaint.style.entries");
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -283 +283 @@
         if (taggingPresets.isEmpty()) {
             Main.main.menu.presetsMenu.setVisible(false);
-        }
-        else
-        {
+        } else {
             AutoCompletionManager.cachePresets(taggingPresets);
             HashMap<TaggingPresetMenu,JMenu> submenus = new HashMap<TaggingPresetMenu,JMenu>();
-            for (final TaggingPreset p : taggingPresets)
-            {
+            for (final TaggingPreset p : taggingPresets) {
                 JMenu m = p.group != null ? submenus.get(p.group) : Main.main.menu.presetsMenu;
                 if (p instanceof TaggingPresetSeparator) {
                     m.add(new JSeparator());
-                } else if (p instanceof TaggingPresetMenu)
-                {
+                } else if (p instanceof TaggingPresetMenu) {
                     JMenu submenu = new JMenu(p);
                     submenu.setText(p.getLocaleName());
@@ -300 +296 @@
                     submenus.put((TaggingPresetMenu)p, submenu);
                     m.add(submenu);
-                }
-                else
-                {
+                } else {
                     JMenuItem mi = new JMenuItem(p);
                     mi.setText(p.getLocaleName());
@@ -309 +303 @@
             }
         }
-        if(Main.pref.getBoolean("taggingpreset.sortmenu")) {
+        if (Main.pref.getBoolean("taggingpreset.sortmenu")) {
             TaggingPresetMenu.sortMenu(Main.main.menu.presetsMenu);
         }
@@ -316 +310 @@
     public static class PresetPrefHelper extends SourceEditor.SourcePrefHelper {
 
+        /**
+         * The unique instance.
+         */
         public final static PresetPrefHelper INSTANCE = new PresetPrefHelper();
 
+        /**
+         * Constructs a new {@code PresetPrefHelper}.
+         */
         public PresetPrefHelper() {
-            super("taggingpreset.entries", "taggingpreset.sources-list");
+            super("taggingpreset.entries");
         }