Changeset 13672 in josm for trunk/src/org

Timestamp:

2018-04-24T00:03:28+02:00 (7 years ago)

Author:

Don-vip

Message:

fix recent SonarQube issues

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/cache/JCSCacheManager.java (modified) (2 diffs)
• data/validation/OsmValidator.java (modified) (1 diff)
• tools/WinRegistry.java (modified) (3 diffs)

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

@@ -122 +122 @@
                         Logging.warn("Cannot lock cache directory. Will not use disk cache");
                 } catch (IOException e) {
-                    Logging.warn("Cannot create cache dir \"" + cacheDirLockPath.toString() + "\" lock file: " + e.toString());
+                    Logging.log(Logging.LEVEL_WARN, "Cannot create cache dir \"" + cacheDirLockPath + "\" lock file:", e);
                     Logging.warn("Will not use disk cache");
                 }
@@ -200 +200 @@
                 // in case any error in setting auxiliary cache, do not use disk cache at all - only memory
                 cc.setAuxCaches(new AuxiliaryCache[0]);
+                Logging.debug(e);
             }
         }

trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java

@@ -405 +405 @@
                 Logging.error(message);
                 if (!GraphicsEnvironment.isHeadless()) {
-                    GuiHelper.runInEDT(() -> {
-                        JOptionPane.showMessageDialog(Main.parent, message, tr("Error"), JOptionPane.ERROR_MESSAGE);
-                    });
+                    GuiHelper.runInEDT(() ->
+                        JOptionPane.showMessageDialog(Main.parent, message, tr("Error"), JOptionPane.ERROR_MESSAGE)
+                    );
                 }
             }

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

@@ -183 +183 @@
             throws IllegalAccessException, InvocationTargetException {
         if (regOpenKey == null || regQueryInfoKey == null || regEnumValue == null || regCloseKey == null) {
-            return null;
+            return Collections.emptyMap();
         }
         HashMap<String, String> results = new HashMap<>();
@@ -189 +189 @@
         Object handles = regOpenKey.invoke(root, hkey(hkey), toCstr(key), Integer.valueOf(KEY_READ));
         if (getNumber(handles, 1).longValue() != REG_SUCCESS) {
-            return null;
+            return Collections.emptyMap();
         }
         // Need to capture both int[] (Java 8-10) and long[] (Java 11+)
@@ -208 +208 @@
             throws IllegalAccessException, InvocationTargetException {
         if (regOpenKey == null || regQueryInfoKey == null || regEnumKeyEx == null || regCloseKey == null) {
-            return null;
+            return Collections.emptyList();
         }
         List<String> results = new ArrayList<>();