Changeset 10755 in josm for trunk

Timestamp:

2016-08-07T14:46:57+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - various fixes

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/ExtensionFileFilter.java (modified) (2 diffs)
• actions/JoinAreasAction.java (modified) (1 diff)
• data/cache/JCSCachedTileLoaderJob.java (modified) (16 diffs)
• data/osm/TagMap.java (modified) (1 diff)
• data/validation/tests/UnclosedWays.java (modified) (6 diffs)
• gui/MainApplication.java (modified) (1 diff)
• gui/MapView.java (modified) (2 diffs)
• gui/SideButton.java (modified) (1 diff)
• gui/bbox/SlippyMapBBoxChooser.java (modified) (1 diff)
• gui/dialogs/properties/TagEditHelper.java (modified) (1 diff)
• gui/dialogs/relation/MemberTransferHandler.java (modified) (1 diff)
• gui/history/SelectionSynchronizer.java (modified) (1 diff)
• gui/history/TagInfoTransferHandler.java (modified) (1 diff)
• gui/layer/GpxLayer.java (modified) (1 diff)
• gui/layer/gpx/ChooseTrackVisibilityAction.java (modified) (1 diff)
• gui/layer/imagery/SharpenImageProcessor.java (modified) (1 diff)
• gui/widgets/ButtonColumn.java (modified) (1 diff)
• io/MultiFetchServerObjectReader.java (modified) (1 diff)
• tools/ImageProvider.java (modified) (1 diff)
• tools/ImageResource.java (modified) (1 diff)

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

@@ -21 +21 @@
 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 +59 @@
 
         final List<Class<? extends FileImporter>> 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
         );
 

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

@@ -1008 +1008 @@
      * @return outer ways
      */
-    private List<AssembledMultipolygon> findPolygons(Collection<AssembledPolygon> boundaries) {
+    private static List<AssembledMultipolygon> findPolygons(Collection<AssembledPolygon> boundaries) {
 
         List<PolygonLevel> list = findOuterWaysImpl(0, boundaries);

trunk/src/org/openstreetmap/josm/data/cache/JCSCachedTileLoaderJob.java

@@ -46 +46 @@
  */
 public abstract class JCSCachedTileLoaderJob<K, V extends CacheEntry> implements ICachedLoaderJob<K> {
-    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 +159 @@
         }
         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 +174 @@
         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 +222 @@
         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 +228 @@
             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 +241 @@
                     // 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 +259 @@
         }
         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 +276 @@
             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 +283 @@
                 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 +305 @@
                     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 +324 @@
                 // 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 +334 @@
                 // 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 +360 @@
                     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 +366 @@
                     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 +384 @@
             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 +395 @@
         } 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;
     }

trunk/src/org/openstreetmap/josm/data/osm/TagMap.java

@@ -280 +280 @@
         stringBuilder.append("TagMap[");
         boolean first = true;
-        for (java.util.Map.Entry<String, String> e : entrySet()) {
+        for (Map.Entry<String, String> e : entrySet()) {
             if (!first) {
                 stringBuilder.append(',');

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

@@ -38 +38 @@
      * @since 6390
      */
-    private class UnclosedWaysCheck {
+    private static class UnclosedWaysCheck {
         /** The unique numeric code for this check */
         public final int code;
@@ -90 +90 @@
          * 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 +100 @@
                 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 +118 @@
      * @since 6390
      */
-    private final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck {
+    private static final class UnclosedWaysBooleanCheck extends UnclosedWaysCheck {
 
         /**
@@ -137 +138 @@
     }
 
-    private final UnclosedWaysCheck[] checks = {
+    private static final UnclosedWaysCheck[] checks = {
         // CHECKSTYLE.OFF: SingleSpaceSeparator
         new UnclosedWaysCheck(1101, "natural",   marktr("natural type {0}"),
@@ -183 +184 @@
 
         for (UnclosedWaysCheck c : checks) {
-            TestError error = c.getTestError(w);
+            TestError error = c.getTestError(w, this);
             if (error != null) {
                 errors.add(error);

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

@@ -683 +683 @@
         }
 
-        private boolean handleNetworkErrors() {
+        private static boolean handleNetworkErrors() {
             boolean condition = !NETWORK_ERRORS.isEmpty();
             if (condition) {

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

@@ -267 +267 @@
     /**
      * This class is an adapter for the old layer change interface.
-     * <p>
-     * 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 +326 @@
      */
     private static class WarningLayerPainter implements LayerPainter {
-        boolean warningPrinted = false;
+        boolean warningPrinted;
         private final Layer layer;
 

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

@@ -85 +85 @@
         if (action != null) {
             propertyChangeListener = evt -> {
-                if (javax.swing.Action.SMALL_ICON.equals(evt.getPropertyName())) {
+                if (Action.SMALL_ICON.equals(evt.getPropertyName())) {
                     fixIcon(null);
                 }

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

@@ -173 +173 @@
     }
 
-    private List<TileSource> getAllTileSources() {
+    private static List<TileSource> getAllTileSources() {
         List<TileSource> tileSources = new ArrayList<>();
         for (TileSourceProvider provider: providers) {

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

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

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/MemberTransferHandler.java

@@ -58 +58 @@
     }
 
-    private int computeInsertionRow(TransferSupport support, MemberTable destination) {
+    private static int computeInsertionRow(TransferSupport support, MemberTable destination) {
         final int insertRow;
         if (support.isDrop()) {

trunk/src/org/openstreetmap/josm/gui/history/SelectionSynchronizer.java

@@ -13 +13 @@
 
     private final Set<ListSelectionModel> participants;
-    private boolean preventRecursion = false;
+    private boolean preventRecursion;
 
     /**

trunk/src/org/openstreetmap/josm/gui/history/TagInfoTransferHandler.java

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

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

@@ -177 +177 @@
 
         info.append(tr("Length: {0}", SystemOfMeasurement.getSystemOfMeasurement().getDistText(data.length()))).append("<br>")
-            .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("<br>")
-            .append("</html>");
+            .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("<br></html>");
 
         final JScrollPane sp = new JScrollPane(new HtmlPanel(info.toString()));

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ChooseTrackVisibilityAction.java

@@ -128 +128 @@
      * @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);

trunk/src/org/openstreetmap/josm/gui/layer/imagery/SharpenImageProcessor.java

@@ -68 +68 @@
     }
 
-    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.");

trunk/src/org/openstreetmap/josm/gui/widgets/ButtonColumn.java

@@ -29 +29 @@
     private final JButton editButton;
     private Object editorValue;
-    private String buttonName = null;
+    private String buttonName;
 
     /**

trunk/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java

@@ -274 +274 @@
     protected String buildRequestString(final OsmPrimitiveType type, Set<Long> idPackage) {
         return type.getAPIName() + "s?" + type.getAPIName() + "s=" + Utils.join(",", idPackage);
-    }
-
-    @Override
-    protected String getBaseUrl() {
-        return super.getBaseUrl();
     }
 

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -291 +291 @@
     protected List<ImageOverlay> overlayInfo;
     /** <code>true</code> if icon must be grayed out */
-    protected boolean isDisabled = false;
+    protected boolean isDisabled;
 
     private static SVGUniverse svgUniverse;

trunk/src/org/openstreetmap/josm/tools/ImageResource.java

@@ -49 +49 @@
      * <code>true</code> if icon must be grayed out
      */
-    protected boolean isDisabled = false;
+    protected boolean isDisabled;
     /**
      * The base raster image for the final output