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

Timestamp:

2015-10-09T02:12:45+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S3052 - Fields should not be initialized to default values

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioPlayer.java (modified) (1 diff)
• BugReportExceptionHandler.java (modified) (1 diff)
• CopyList.java (modified) (1 diff)
• Diff.java (modified) (2 diffs)
• I18n.java (modified) (1 diff)
• ImageProvider.java (modified) (1 diff)
• ImageResource.java (modified) (1 diff)
• Shortcut.java (modified) (1 diff)
• TextTagParser.java (modified) (1 diff)
• XmlObjectParser.java (modified) (1 diff)

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

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

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

@@ -41 +41 @@
 public final class BugReportExceptionHandler implements Thread.UncaughtExceptionHandler {
 
-    private static boolean handlingInProgress = false;
-    private static volatile BugReporterThread bugReporterThread = null;
-    private static int exceptionCounter = 0;
-    private static boolean suppressExceptionDialogs = false;
+    private static boolean handlingInProgress;
+    private static volatile BugReporterThread bugReporterThread;
+    private static int exceptionCounter;
+    private static boolean suppressExceptionDialogs;
 
     private static class BugReporterThread extends Thread {

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

@@ -148 +148 @@
          * Index of element to be returned by subsequent call to next.
          */
-        private int cursor = 0;
+        private int cursor;
 
         /**

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

@@ -107 +107 @@
     With this heuristic, for files with a constant small density
     of changes, the algorithm is linear in the file size.  */
-    public boolean heuristic = false;
+    public boolean heuristic;
 
     /** When set to true, the algorithm returns a guarranteed minimal
       set of changes.  This makes things slower, sometimes much slower. */
-    public boolean noDiscards = false;
+    public boolean noDiscards;
 
     private int[] xvec, yvec; /* Vectors being compared. */
@@ -376 +376 @@
     }
 
-    private boolean inhibit = false;
+    private boolean inhibit;
 
     /** Adjust inserts/deletes of blank lines to join changes

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

@@ -171 +171 @@
         "OptionPane.cancelButtonText"
     };
-    private static volatile Map<String, String> strings = null;
-    private static volatile Map<String, String[]> pstrings = null;
+    private static volatile Map<String, String> strings;
+    private static volatile Map<String, String[]> pstrings;
     private static Map<String, PluralMode> languages = new HashMap<>();
 

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

@@ -184 +184 @@
     protected Collection<ClassLoader> additionalClassLoaders;
     /** ordered list of overlay images */
-    protected List<ImageOverlay> overlayInfo = null;
+    protected List<ImageOverlay> overlayInfo;
 
     private static SVGUniverse svgUniverse;

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

@@ -40 +40 @@
      * ordered list of overlay images
      */
-    protected List<ImageOverlay> overlayInfo = null;
-    private Image baseImage = null;
+    protected List<ImageOverlay> overlayInfo;
+    private Image baseImage;
 
     /**

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

@@ -311 +311 @@
 
     // bootstrap
-    private static boolean initdone = false;
+    private static boolean initdone;
     private static void doInit() {
         if (initdone) return;

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

@@ -40 +40 @@
 
     public static class TextAnalyzer {
-        private boolean quotesStarted = false;
-        private boolean esc = false;
+        private boolean quotesStarted;
+        private boolean esc;
         private StringBuilder s = new StringBuilder(200);
         private int pos;

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

@@ -232 +232 @@
      */
     private List<Object> queue = new LinkedList<>();
-    private Iterator<Object> queueIterator = null;
+    private Iterator<Object> queueIterator;
 
     /**