Changeset 5889 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2013-04-20T15:50:18+02:00 (11 years ago)

Author:

Don-vip

Message:

fix potential bugs detected by FindBugs

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• AutosaveTask.java (modified) (1 diff)
• projection/CustomProjection.java (modified) (1 diff)
• projection/Projections.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/AutosaveTask.java

@@ -295 +295 @@
                         try {
                             String jvmId = reader.readLine();
-                            String pid = jvmId.split("@")[0];
-                            skipFile = jvmPerfDataFileExists(pid);
+                            if (jvmId != null) {
+                                String pid = jvmId.split("@")[0];
+                                skipFile = jvmPerfDataFileExists(pid);
+                            }
                         } catch (Throwable t) {
                             System.err.println(t.getClass()+":"+t.getMessage());

trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

@@ -366 +366 @@
 
     public static double parseDouble(Map<String, String> parameters, String parameterName) throws ProjectionConfigurationException {
+        if (!parameters.containsKey(parameterName))
+            throw new IllegalArgumentException(tr("Unknown parameter ''{0}''", parameterName));
         String doubleStr = parameters.get(parameterName);
-        if (doubleStr == null && parameters.containsKey(parameterName))
+        if (doubleStr == null)
             throw new ProjectionConfigurationException(
                     tr("Expected number argument for parameter ''{0}''", parameterName));

trunk/src/org/openstreetmap/josm/data/projection/Projections.java

@@ -165 +165 @@
         if (proj != null) return proj;
         ProjectionChoice pc = allProjectionChoicesByCode.get(code);
-        if (pc != null) {
+        if (pc == null) {
             Pair<String, String> pair = inits.get(code);
             if (pair == null) return null;
@@ -183 +183 @@
         return Collections.unmodifiableCollection(allCodes);
     }
-
 }