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

Timestamp:

2015-03-08T23:39:57+01:00 (11 years ago)

Author:

Don-vip

Message:

fix Sonar issue squid:S2444 - Lazy initialization of "static" fields should be "synchronized"

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioPlayer.java (modified) (1 diff)
• BugReportExceptionHandler.java (modified) (1 diff)
• I18n.java (modified) (2 diffs)
• ImageProvider.java (modified) (1 diff)
• MultikeyActionsHandler.java (modified) (1 diff)
• RightAndLefthandTraffic.java (modified) (2 diffs)

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

@@ -26 +26 @@
 public final class AudioPlayer extends Thread {
 
-    private static AudioPlayer audioPlayer = null;
+    private static volatile AudioPlayer audioPlayer = null;
 
     private enum State { INITIALIZING, NOTPLAYING, PLAYING, PAUSED, INTERRUPTED }

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

@@ -42 +42 @@
 
     private static boolean handlingInProgress = false;
-    private static BugReporterThread bugReporterThread = null;
+    private static volatile BugReporterThread bugReporterThread = null;
     private static int exceptionCounter = 0;
     private static boolean suppressExceptionDialogs = false;

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

@@ -76 +76 @@
     }
 
-    private static PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
-    private static String loadedCode = "en";
+    private static volatile PluralMode pluralMode = PluralMode.MODE_NOTONE; /* english default */
+    private static volatile String loadedCode = "en";
 
     /* Localization keys for file chooser (and color chooser). */
@@ -164 +164 @@
         "OptionPane.cancelButtonText"
     };
-    private static Map<String, String> strings = null;
-    private static Map<String, String[]> pstrings = null;
+    private static volatile Map<String, String> strings = null;
+    private static volatile Map<String, String[]> pstrings = null;
     private static Map<String, PluralMode> languages = new HashMap<>();
 

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

@@ -1356 +1356 @@
     }
 
-    private static SVGUniverse getSvgUniverse() {
+    private static synchronized SVGUniverse getSvgUniverse() {
         if (svgUniverse == null) {
             svgUniverse = new SVGUniverse();

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

@@ -124 +124 @@
      * @return The unique instance of this class
      */
-    public static MultikeyActionsHandler getInstance() {
+    public static synchronized MultikeyActionsHandler getInstance() {
         if (instance == null) {
             instance = new MultikeyActionsHandler();

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

@@ -7 +7 @@
 import java.util.ArrayList;
 import java.util.Collection;
+
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.BBox;
@@ -47 +48 @@
     }
 
-    private static Collection<Area> leftHandTrafficPolygons;
-    private static GeoPropertyIndex<Boolean> rlCache;
+    private static volatile Collection<Area> leftHandTrafficPolygons;
+    private static volatile GeoPropertyIndex<Boolean> rlCache;
 
     /**