Index: trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java (revision 10755) @@ -21,4 +21,12 @@ import org.openstreetmap.josm.io.FileExporter; import org.openstreetmap.josm.io.FileImporter; +import org.openstreetmap.josm.io.GpxImporter; +import org.openstreetmap.josm.io.JpgImporter; +import org.openstreetmap.josm.io.NMEAImporter; +import org.openstreetmap.josm.io.NoteImporter; +import org.openstreetmap.josm.io.OsmChangeImporter; +import org.openstreetmap.josm.io.OsmImporter; +import org.openstreetmap.josm.io.WMSLayerImporter; +import org.openstreetmap.josm.io.session.SessionImporter; import org.openstreetmap.josm.tools.Utils; @@ -51,13 +59,13 @@ final List> importerNames = Arrays.asList( - org.openstreetmap.josm.io.OsmImporter.class, - org.openstreetmap.josm.io.OsmChangeImporter.class, - org.openstreetmap.josm.io.GpxImporter.class, - org.openstreetmap.josm.io.NMEAImporter.class, - org.openstreetmap.josm.io.NoteImporter.class, - org.openstreetmap.josm.io.JpgImporter.class, - org.openstreetmap.josm.io.WMSLayerImporter.class, - org.openstreetmap.josm.io.AllFormatsImporter.class, - org.openstreetmap.josm.io.session.SessionImporter.class + OsmImporter.class, + OsmChangeImporter.class, + GpxImporter.class, + NMEAImporter.class, + NoteImporter.class, + JpgImporter.class, + WMSLayerImporter.class, + AllFormatsImporter.class, + SessionImporter.class ); Index: trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java (revision 10755) @@ -1008,5 +1008,5 @@ * @return outer ways */ - private List findPolygons(Collection boundaries) { + private static List findPolygons(Collection boundaries) { List list = findOuterWaysImpl(0, boundaries); Index: trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java (revision 10755) @@ -46,5 +46,5 @@ */ public abstract class JCSCachedTileLoaderJob implements ICachedLoaderJob { - private static final Logger log = FeatureAdapter.getLogger(JCSCachedTileLoaderJob.class.getCanonicalName()); + private static final Logger LOG = FeatureAdapter.getLogger(JCSCachedTileLoaderJob.class.getCanonicalName()); protected static final long DEFAULT_EXPIRE_TIME = 1000L * 60 * 60 * 24 * 7; // 7 days // Limit for the max-age value send by the server. @@ -159,5 +159,5 @@ } if (deduplicationKey == null) { - log.log(Level.WARNING, "No url returned for: {0}, skipping", getCacheKey()); + LOG.log(Level.WARNING, "No url returned for: {0}, skipping", getCacheKey()); throw new IllegalArgumentException("No url returned"); } @@ -174,5 +174,5 @@ if (first || force) { // submit all jobs to separate thread, so calling thread is not blocked with IO when loading from disk - log.log(Level.FINE, "JCS - Submitting job for execution for url: {0}", getUrlNoException()); + LOG.log(Level.FINE, "JCS - Submitting job for execution for url: {0}", getUrlNoException()); downloadJobExecutor.execute(this); } @@ -222,5 +222,5 @@ final String oldName = currentThread.getName(); currentThread.setName("JCS Downloading: " + getUrlNoException()); - log.log(Level.FINE, "JCS - starting fetch of url: {0} ", getUrlNoException()); + LOG.log(Level.FINE, "JCS - starting fetch of url: {0} ", getUrlNoException()); ensureCacheElement(); try { @@ -228,5 +228,5 @@ if (!force && cacheElement != null && isCacheElementValid() && isObjectLoadable()) { // we got something in cache, and it's valid, so lets return it - log.log(Level.FINE, "JCS - Returning object from cache: {0}", getCacheKey()); + LOG.log(Level.FINE, "JCS - Returning object from cache: {0}", getCacheKey()); finishLoading(LoadResult.SUCCESS); return; @@ -241,5 +241,5 @@ // try to get stale entry in cache finishLoading(LoadResult.SUCCESS); - log.log(Level.FINE, "JCS - found stale object in cache: {0}", getUrlNoException()); + LOG.log(Level.FINE, "JCS - found stale object in cache: {0}", getUrlNoException()); } else { // failed completely @@ -259,5 +259,5 @@ } if (listeners == null) { - log.log(Level.WARNING, "Listener not found for URL: {0}. Listener not notified!", getUrlNoException()); + LOG.log(Level.WARNING, "Listener not found for URL: {0}. Listener not notified!", getUrlNoException()); return; } @@ -276,5 +276,5 @@ expires = Math.min(expires, attributes.getCreateTime() + EXPIRE_TIME_SERVER_LIMIT); if (now > expires) { - log.log(Level.FINE, "JCS - Object {0} has expired -> valid to {1}, now is: {2}", + LOG.log(Level.FINE, "JCS - Object {0} has expired -> valid to {1}, now is: {2}", new Object[]{getUrlNoException(), Long.toString(expires), Long.toString(now)}); return false; @@ -283,8 +283,8 @@ now - attributes.getLastModification() > DEFAULT_EXPIRE_TIME) { // check by file modification date - log.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrlNoException()); + LOG.log(Level.FINE, "JCS - Object has expired, maximum file age reached {0}", getUrlNoException()); return false; } else if (now - attributes.getCreateTime() > DEFAULT_EXPIRE_TIME) { - log.log(Level.FINE, "JCS - Object has expired, maximum time since object creation reached {0}", getUrlNoException()); + LOG.log(Level.FINE, "JCS - Object has expired, maximum time since object creation reached {0}", getUrlNoException()); return false; } @@ -305,5 +305,5 @@ Boolean.TRUE.equals(useHead.get(getServerKey())) && isCacheValidUsingHead()) { - log.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl()); + LOG.log(Level.FINE, "JCS - cache entry verified using HEAD request: {0}", getUrl()); return true; } @@ -324,5 +324,5 @@ // If isModifiedSince or If-None-Match has been set // and the server answers with a HTTP 304 = "Not Modified" - log.log(Level.FINE, "JCS - If-Modified-Since/ETag test: local version is up to date: {0}", getUrl()); + LOG.log(Level.FINE, "JCS - If-Modified-Since/ETag test: local version is up to date: {0}", getUrl()); return true; } else if (isObjectLoadable() // we have an object in cache, but we haven't received 304 response code @@ -334,5 +334,5 @@ // for further requests - use HEAD String serverKey = getServerKey(); - log.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modified-Since or If-None-Match headers", + LOG.log(Level.INFO, "JCS - Host: {0} found not to return 304 codes for If-Modified-Since or If-None-Match headers", serverKey); useHead.put(serverKey, Boolean.TRUE); @@ -360,5 +360,5 @@ cacheData = createCacheEntry(raw); cache.put(getCacheKey(), cacheData, attributes); - log.log(Level.FINE, "JCS - downloaded key: {0}, length: {1}, url: {2}", + LOG.log(Level.FINE, "JCS - downloaded key: {0}, length: {1}, url: {2}", new Object[] {getCacheKey(), raw.length, getUrl()}); return true; @@ -366,13 +366,13 @@ cacheData = createCacheEntry(new byte[]{}); cache.put(getCacheKey(), cacheData, attributes); - log.log(Level.FINE, "JCS - Caching empty object {0}", getUrl()); + LOG.log(Level.FINE, "JCS - Caching empty object {0}", getUrl()); return true; } else { - log.log(Level.FINE, "JCS - failure during load - reponse is not loadable nor cached as empty"); + LOG.log(Level.FINE, "JCS - failure during load - reponse is not loadable nor cached as empty"); return false; } } } catch (FileNotFoundException e) { - log.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrlNoException()); + LOG.log(Level.FINE, "JCS - Caching empty object as server returned 404 for: {0}", getUrlNoException()); attributes.setResponseCode(404); attributes.setError(e); @@ -384,5 +384,5 @@ return doCache; } catch (IOException e) { - log.log(Level.FINE, "JCS - IOExecption during communication with server for: {0}", getUrlNoException()); + LOG.log(Level.FINE, "JCS - IOExecption during communication with server for: {0}", getUrlNoException()); if (isObjectLoadable()) { return true; @@ -395,8 +395,8 @@ } catch (InterruptedException e) { attributes.setError(e); - log.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException()); + LOG.log(Level.WARNING, "JCS - Exception during download {0}", getUrlNoException()); Main.warn(e); } - log.log(Level.WARNING, "JCS - Silent failure during download: {0}", getUrlNoException()); + LOG.log(Level.WARNING, "JCS - Silent failure during download: {0}", getUrlNoException()); return false; } Index: trunk/src/org/openstreetmap/josm/data/osm/TagMap.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/osm/TagMap.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/data/osm/TagMap.java (revision 10755) @@ -280,5 +280,5 @@ stringBuilder.append("TagMap["); boolean first = true; - for (java.util.Map.Entry e : entrySet()) { + for (Map.Entry e : entrySet()) { if (!first) { stringBuilder.append(','); Index: trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/data/validation/tests/UnclosedWays.java (revision 10755) @@ -38,5 +38,5 @@ * @since 6390 */ - private class UnclosedWaysCheck { + private static class UnclosedWaysCheck { /** The unique numeric code for this check */ public final int code; @@ -90,7 +90,8 @@ * Returns the test error of the given way, if any. * @param w The way to check + * @param test parent test * @return The test error if the way is erroneous, {@code null} otherwise */ - public final TestError getTestError(Way w) { + public final TestError getTestError(Way w, UnclosedWays test) { String value = w.get(key); if (isValueErroneous(value)) { @@ -99,5 +100,5 @@ String etype = engMessage.contains("{0}") ? MessageFormat.format(engMessage, value) : engMessage; // CHECKSTYLE.ON: SingleSpaceSeparator - return new TestError(UnclosedWays.this, Severity.WARNING, tr("Unclosed way"), + return new TestError(test, Severity.WARNING, tr("Unclosed way"), type, etype, code, Arrays.asList(w), // The important parts of an unclosed way are the first and @@ -117,5 +118,5 @@ * @since 6390 */ - private final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck { + private static final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck { /** @@ -137,5 +138,5 @@ } - private final UnclosedWaysCheck[] checks = { + private static final UnclosedWaysCheck[] checks = { // CHECKSTYLE.OFF: SingleSpaceSeparator new UnclosedWaysCheck(1101, "natural", marktr("natural type {0}"), @@ -183,5 +184,5 @@ for (UnclosedWaysCheck c : checks) { - TestError error = c.getTestError(w); + TestError error = c.getTestError(w, this); if (error != null) { errors.add(error); Index: trunk/src/org/openstreetmap/josm/gui/MainApplication.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/MainApplication.java (revision 10755) @@ -683,5 +683,5 @@ } - private boolean handleNetworkErrors() { + private static boolean handleNetworkErrors() { boolean condition = !NETWORK_ERRORS.isEmpty(); if (condition) { Index: trunk/src/org/openstreetmap/josm/gui/MapView.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/MapView.java (revision 10755) @@ -267,9 +267,9 @@ /** * This class is an adapter for the old layer change interface. - *

- * New implementations should use {@link org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener} * @author Michael Zangl * @since 10271 - */ + * @deprecated New implementations should use {@link org.openstreetmap.josm.gui.layer.MainLayerManager.ActiveLayerChangeListener} + */ + @Deprecated protected static class EditLayerChangeAdapter implements ActiveLayerChangeListener { @@ -326,5 +326,5 @@ */ private static class WarningLayerPainter implements LayerPainter { - boolean warningPrinted = false; + boolean warningPrinted; private final Layer layer; Index: trunk/src/org/openstreetmap/josm/gui/SideButton.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/SideButton.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/SideButton.java (revision 10755) @@ -85,5 +85,5 @@ if (action != null) { propertyChangeListener = evt -> { - if (javax.swing.Action.SMALL_ICON.equals(evt.getPropertyName())) { + if (Action.SMALL_ICON.equals(evt.getPropertyName())) { fixIcon(null); } Index: trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/bbox/SlippyMapBBoxChooser.java (revision 10755) @@ -173,5 +173,5 @@ } - private List getAllTileSources() { + private static List getAllTileSources() { List tileSources = new ArrayList<>(); for (TileSourceProvider provider: providers) { Index: trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java (revision 10755) @@ -468,10 +468,10 @@ public void performTagEdit() { String value = Tag.removeWhiteSpaces(values.getEditor().getItem().toString()); - value = Normalizer.normalize(value, java.text.Normalizer.Form.NFC); + value = Normalizer.normalize(value, Normalizer.Form.NFC); if (value.isEmpty()) { value = null; // delete the key } String newkey = Tag.removeWhiteSpaces(keys.getEditor().getItem().toString()); - newkey = Normalizer.normalize(newkey, java.text.Normalizer.Form.NFC); + newkey = Normalizer.normalize(newkey, Normalizer.Form.NFC); if (newkey.isEmpty()) { newkey = key; Index: trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java (revision 10755) @@ -58,5 +58,5 @@ } - private int computeInsertionRow(TransferSupport support, MemberTable destination) { + private static int computeInsertionRow(TransferSupport support, MemberTable destination) { final int insertRow; if (support.isDrop()) { Index: trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java (revision 10755) @@ -13,5 +13,5 @@ private final Set participants; - private boolean preventRecursion = false; + private boolean preventRecursion; /** Index: trunk/src/org/openstreetmap/josm/gui/history/TagInfoTransferHandler.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/history/TagInfoTransferHandler.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/history/TagInfoTransferHandler.java (revision 10755) @@ -23,5 +23,5 @@ @Override - public void exportToClipboard(JComponent comp, Clipboard clip, int action) throws IllegalStateException { + public void exportToClipboard(JComponent comp, Clipboard clip, int action) { if (comp instanceof JTable) { TableModel model = ((JTable) comp).getModel(); Index: trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 10755) @@ -177,7 +177,6 @@ info.append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length()))).append("
") - .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())).append( - trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
") - .append(""); + .append(trn("{0} route, ", "{0} routes, ", data.routes.size(), data.routes.size())) + .append(trn("{0} waypoint", "{0} waypoints", data.waypoints.size(), data.waypoints.size())).append("
"); final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString())); Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java (revision 10755) @@ -128,5 +128,5 @@ * @return non-editable table */ - private JTable buildTable(Object[]... content) { + private static JTable buildTable(Object[]... content) { final String[] headers = {tr("Name"), tr("Description"), tr("Timespan"), tr("Length"), tr("URL")}; DefaultTableModel model = new DefaultTableModel(content, headers); Index: trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java (revision 10755) @@ -68,5 +68,5 @@ } - private ConvolveOp generateMixed(float aFactor, float[] a, float[] b) { + private static ConvolveOp generateMixed(float aFactor, float[] a, float[] b) { if (a.length != 9 || b.length != 9) { throw new IllegalArgumentException("Illegal kernel array length."); Index: trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java (revision 10755) @@ -29,5 +29,5 @@ private final JButton editButton; private Object editorValue; - private String buttonName = null; + private String buttonName; /** Index: trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java (revision 10755) @@ -274,9 +274,4 @@ protected String buildRequestString(final OsmPrimitiveType type, Set idPackage) { return type.getAPIName() + "s?" + type.getAPIName() + "s=" + Utils.join(",", idPackage); - } - - @Override - protected String getBaseUrl() { - return super.getBaseUrl(); } Index: trunk/src/org/openstreetmap/josm/tools/ImageProvider.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (revision 10755) @@ -291,5 +291,5 @@ protected List overlayInfo; /** true if icon must be grayed out */ - protected boolean isDisabled = false; + protected boolean isDisabled; private static SVGUniverse svgUniverse; Index: trunk/src/org/openstreetmap/josm/tools/ImageResource.java =================================================================== --- trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 10754) +++ trunk/src/org/openstreetmap/josm/tools/ImageResource.java (revision 10755) @@ -49,5 +49,5 @@ * true if icon must be grayed out */ - protected boolean isDisabled = false; + protected boolean isDisabled; /** * The base raster image for the final output