Changeset 6235 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2013-09-19T02:14:38+02:00 (13 years ago)

Author:

Don-vip

Message:

Sonar - fix recently introduced issues

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• Diff.java (modified) (1 diff)
• ImageProvider.java (modified) (3 diffs)

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

@@ -945 +945 @@
         final int buffered_lines;
 
-        /** Number of common prefix elements. */
-        final int prefix_lines = 0;
-
         /** Vector, indexed by line number, containing an equivalence code for
            each line.  It is this vector that is actually compared with that

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

@@ -116 +116 @@
      * Caches the image data for rotated versions of the same image.
      */
-    private static final Map<Image, Map<Long, ImageResource>> rotateCache = new HashMap<Image, Map<Long, ImageResource>>();
-
-    private static final ExecutorService imageFetcher = Executors.newSingleThreadExecutor();
+    private static final Map<Image, Map<Long, ImageResource>> ROTATE_CACHE = new HashMap<Image, Map<Long, ImageResource>>();
+
+    private static final ExecutorService IMAGE_FETCHER = Executors.newSingleThreadExecutor();
 
     public interface ImageCallback {
@@ -339 +339 @@
                 }
             };
-            imageFetcher.submit(fetch);
+            IMAGE_FETCHER.submit(fetch);
         } else {
             ImageIcon result = get();
@@ -856 +856 @@
         ImageResource imageResource = null;
 
-        synchronized (rotateCache) {
-            Map<Long, ImageResource> cacheByAngle = rotateCache.get(img);
+        synchronized (ROTATE_CACHE) {
+            Map<Long, ImageResource> cacheByAngle = ROTATE_CACHE.get(img);
             if (cacheByAngle == null) {
-                rotateCache.put(img, cacheByAngle = new HashMap<Long, ImageResource>());
+                ROTATE_CACHE.put(img, cacheByAngle = new HashMap<Long, ImageResource>());
             }