Changeset 9205 in josm

Timestamp:

2015-12-28T21:25:25+01:00 (8 years ago)

Author:

Don-vip

Message:

fix some Findbugs warnings

Location:

trunk

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/Main.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/FileWatcher.java (modified) (2 diffs)
• test/performance/org/openstreetmap/josm/PerformanceTestUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java (modified) (1 diff)

trunk/.classpath

@@ -27 +27 @@
         <classpathentry kind="lib" path="test/lib/fest/debug-1.0.jar"/>
         <classpathentry exported="true" kind="con" path="GROOVY_DSL_SUPPORT"/>
+        <classpathentry kind="lib" path="tools/findbugs/annotations.jar"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>

trunk/build.xml

@@ -301 +301 @@
         <pathelement path="dist/josm-custom.jar"/>
         <pathelement path="${groovy.jar}"/>
+        <pathelement path="tools/findbugs/annotations.jar"/>
     </path>
     <macrodef name="init-test-preferences">

trunk/src/org/openstreetmap/josm/Main.java

@@ -556 +556 @@
         main = this;
         isOpenjdk = System.getProperty("java.vm.name").toUpperCase(Locale.ENGLISH).indexOf("OPENJDK") != -1;
+        fileWatcher.start();
 
         new InitializationTask(tr("Executing platform startup hook")) {

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

@@ -31 +31 @@
 
     private WatchService watcher;
+    private Thread thread;
 
     private final Map<Path, StyleSource> styleMap = new HashMap<>();
@@ -41 +42 @@
         try {
             watcher = FileSystems.getDefault().newWatchService();
-            new Thread(new Runnable() {
+            thread = new Thread(new Runnable() {
                 @Override
                 public void run() {
                     processEvents();
                 }
-            }, "File Watcher").start();
+            }, "File Watcher");
         } catch (IOException e) {
             Main.error(e);
+        }
+    }
+
+    /**
+     * Starts the File Watcher thread.
+     */
+    public final void start() {
+        if (!thread.isAlive()) {
+            thread.start();
         }
     }

trunk/test/performance/org/openstreetmap/josm/PerformanceTestUtils.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm;
+
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 
 /**
@@ -37 +39 @@
      * @return A {@link PerformanceTestTimer} object of which you can call {@link PerformanceTestTimer#done()} when done.
      */
+    @SuppressFBWarnings(value = "DM_GC", justification = "Performance test code")
     public static PerformanceTestTimer startTimer(String name) {
         System.gc();

trunk/test/unit/org/openstreetmap/josm/actions/mapmode/SelectActionTest.java

@@ -36 +36 @@
         @Override
         public synchronized int getInteger(String key, int def) {
-            if (key == "edit.initial-move-delay") {
+            if ("edit.initial-move-delay".equals(key)) {
                 return 0;
             } else {