Index: /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 6378) @@ -72,6 +72,4 @@ public List innerWays; - public Relation relation; - public Multipolygon(Way way) { outerWay = way; @@ -1278,5 +1276,4 @@ Multipolygon pol = new Multipolygon(outerWay); pol.innerWays.addAll(innerWays); - pol.relation = r; result.add(pol); Index: /trunk/src/org/openstreetmap/josm/data/validation/FixableTestError.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/FixableTestError.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/data/validation/FixableTestError.java (revision 6378) @@ -1,2 +1,3 @@ +// License: GPL. See LICENSE file for details. package org.openstreetmap.josm.data.validation; @@ -6,4 +7,8 @@ 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; Index: /trunk/src/org/openstreetmap/josm/data/validation/TestError.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/TestError.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/data/validation/TestError.java (revision 6378) @@ -28,5 +28,5 @@ /** * Validation error - * @author frsantos + * @since 3669 */ public class TestError implements Comparable, DataSetListener { @@ -52,5 +52,5 @@ /** - * Constructors + * Constructs a new {@code TestError}. * @param tester The tester * @param severity The severity of this error Index: /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/data/validation/tests/OpeningHourTest.java (revision 6378) @@ -164,5 +164,6 @@ 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"))) { Index: /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 6378) @@ -200,5 +200,5 @@ setMaxTilesInMemory(Main.pref.getInteger("slippy_map_chooser.max_tiles", 1000)); - List tileSources = getTileSources(); + List tileSources = getAllTileSources(); iSourceButton = new SourceButton(tileSources); @@ -222,5 +222,5 @@ } - private final List getTileSources() { + private List getAllTileSources() { List tileSources = new ArrayList(); for (TileSourceProvider provider: providers) { @@ -400,5 +400,5 @@ */ public final void refreshTileSources() { - iSourceButton.setSources(getTileSources()); + iSourceButton.setSources(getAllTileSources()); } } Index: /trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/gui/download/BookmarkList.java (revision 6378) @@ -239,5 +239,5 @@ * Saves all bookmarks to the preferences file */ - public void save() { + public final void save() { LinkedList> coll = new LinkedList>(); for (Object o : ((DefaultListModel)getModel()).toArray()) { Index: /trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/gui/mappaint/MapImage.java (revision 6378) @@ -121,5 +121,6 @@ int w = getWidth(), h = getHeight(); if (mustRescale(getImage())) { - w = h = 16; + w = 16; + h = 16; } return new Rectangle(-w/2, -h/2, w, h); Index: /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/SourceEditor.java (revision 6378) @@ -1502,5 +1502,5 @@ private final String pref; - public SourcePrefHelper(String pref, String prefOld) { + public SourcePrefHelper(String pref) { this.pref = pref; } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/MapPaintPreference.java (revision 6378) @@ -170,6 +170,5 @@ MapPaintStyles.readFromPreferences(); } - if (Main.isDisplayingMapView()) - { + if (Main.isDisplayingMapView()) { MapPaintStyles.getStyles().clearCached(); } @@ -186,8 +185,14 @@ 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"); } Index: /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java =================================================================== --- /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6377) +++ /trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java (revision 6378) @@ -283,16 +283,12 @@ if (taggingPresets.isEmpty()) { Main.main.menu.presetsMenu.setVisible(false); - } - else - { + } else { AutoCompletionManager.cachePresets(taggingPresets); HashMap submenus = new HashMap(); - 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,7 +296,5 @@ submenus.put((TaggingPresetMenu)p, submenu); m.add(submenu); - } - else - { + } else { JMenuItem mi = new JMenuItem(p); mi.setText(p.getLocaleName()); @@ -309,5 +303,5 @@ } } - if(Main.pref.getBoolean("taggingpreset.sortmenu")) { + if (Main.pref.getBoolean("taggingpreset.sortmenu")) { TaggingPresetMenu.sortMenu(Main.main.menu.presetsMenu); } @@ -316,8 +310,14 @@ 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"); } Index: /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java =================================================================== --- /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (revision 6377) +++ /trunk/test/unit/org/openstreetmap/josm/data/validation/tests/OpeningHourTestTest.java (revision 6378) @@ -1,2 +1,3 @@ +// License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.validation.tests; @@ -12,4 +13,7 @@ import static org.junit.Assert.assertThat; +/** + * JUnit Test of "Opening hours" validation test. + */ public class OpeningHourTestTest {