Changeset 8286 in josm

Timestamp:

2015-04-28T00:59:25+02:00 (9 years ago)

Author:

Don-vip

Message:

fix sonar squid:S1444 - "public static" fields should always be constant

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCachedTileLoaderJob.java (modified) (1 diff)
• data/imagery/TMSCachedTileLoader.java (modified) (1 diff)
• data/imagery/TMSCachedTileLoaderJob.java (modified) (1 diff)
• gui/ImageryMenu.java (modified) (3 diffs)
• tools/ImageProvider.java (modified) (2 diffs)

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

@@ -57 +57 @@
      * maximum download threads that will be started
      */
-    public static IntegerProperty THREAD_LIMIT = new IntegerProperty("cache.jcs.max_threads", 10);
+    public static final IntegerProperty THREAD_LIMIT = new IntegerProperty("cache.jcs.max_threads", 10);
     private static Executor DOWNLOAD_JOB_DISPATCHER = new ThreadPoolExecutor(
             2, // we have a small queue, so threads will be quickly started (threads are started only, when queue is full)

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoader.java

@@ -32 +32 @@
     public static final String PREFERENCE_PREFIX   = "imagery.tms.cache.";
     // average tile size is about 20kb
-    public static IntegerProperty MAX_OBJECTS_ON_DISK = new IntegerProperty(PREFERENCE_PREFIX + "max_objects_disk", 25000); // 25000 is around 500MB under this assumptions
+    public static final IntegerProperty MAX_OBJECTS_ON_DISK = new IntegerProperty(PREFERENCE_PREFIX + "max_objects_disk", 25000); // 25000 is around 500MB under this assumptions
 
 

trunk/src/org/openstreetmap/josm/data/imagery/TMSCachedTileLoaderJob.java

@@ -41 +41 @@
      * overrides the THREAD_LIMIT in superclass, as we want to have separate limit and pool for TMS
      */
-    public static IntegerProperty THREAD_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobs", 25);
+    public static final IntegerProperty THREAD_LIMIT = new IntegerProperty("imagery.tms.tmsloader.maxjobs", 25);
     /**
      * separate from JCS thread pool for TMS loader, so we can have different thread pools for default JCS

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

@@ -15 +15 @@
 import java.util.Iterator;
 import java.util.List;
+
 import javax.swing.Action;
 import javax.swing.JComponent;
@@ -22 +23 @@
 import javax.swing.event.MenuEvent;
 import javax.swing.event.MenuListener;
+
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AddImageryLayerAction;
@@ -49 +51 @@
      * (for the preferences). We don't want this in the imagery menu.
      */
-    public static Comparator<ImageryInfo> alphabeticImageryComparator = new Comparator<ImageryInfo>() {
+    public static final Comparator<ImageryInfo> alphabeticImageryComparator = new Comparator<ImageryInfo>() {
         @Override
         public int compare(ImageryInfo ii1, ImageryInfo ii2) {

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

@@ -145 +145 @@
      * @since 7132
      */
-    public static String PROP_TRANSPARENCY_FORCED = "josm.transparency.forced";
+    public static final String PROP_TRANSPARENCY_FORCED = "josm.transparency.forced";
 
     /**
@@ -151 +151 @@
      * @since 7132
      */
-    public static String PROP_TRANSPARENCY_COLOR = "josm.transparency.color";
+    public static final String PROP_TRANSPARENCY_COLOR = "josm.transparency.color";
 
     /** directories in which images are searched */