Changeset 13672 in josm for trunk/src/org
- Timestamp:
- 2018-04-24T00:03:28+02:00 (6 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/data/cache/JCSCacheManager.java
r13649 r13672 122 122 Logging.warn("Cannot lock cache directory. Will not use disk cache"); 123 123 } catch (IOException e) { 124 Logging. warn("Cannot create cache dir \"" + cacheDirLockPath.toString() + "\" lock file: " + e.toString());124 Logging.log(Logging.LEVEL_WARN, "Cannot create cache dir \"" + cacheDirLockPath + "\" lock file:", e); 125 125 Logging.warn("Will not use disk cache"); 126 126 } … … 200 200 // in case any error in setting auxiliary cache, do not use disk cache at all - only memory 201 201 cc.setAuxCaches(new AuxiliaryCache[0]); 202 Logging.debug(e); 202 203 } 203 204 } -
trunk/src/org/openstreetmap/josm/data/validation/OsmValidator.java
r13670 r13672 405 405 Logging.error(message); 406 406 if (!GraphicsEnvironment.isHeadless()) { 407 GuiHelper.runInEDT(() -> {408 JOptionPane.showMessageDialog(Main.parent, message, tr("Error"), JOptionPane.ERROR_MESSAGE) ;409 });407 GuiHelper.runInEDT(() -> 408 JOptionPane.showMessageDialog(Main.parent, message, tr("Error"), JOptionPane.ERROR_MESSAGE) 409 ); 410 410 } 411 411 } -
trunk/src/org/openstreetmap/josm/tools/WinRegistry.java
r13651 r13672 183 183 throws IllegalAccessException, InvocationTargetException { 184 184 if (regOpenKey == null || regQueryInfoKey == null || regEnumValue == null || regCloseKey == null) { 185 return null;185 return Collections.emptyMap(); 186 186 } 187 187 HashMap<String, String> results = new HashMap<>(); … … 189 189 Object handles = regOpenKey.invoke(root, hkey(hkey), toCstr(key), Integer.valueOf(KEY_READ)); 190 190 if (getNumber(handles, 1).longValue() != REG_SUCCESS) { 191 return null;191 return Collections.emptyMap(); 192 192 } 193 193 // Need to capture both int[] (Java 8-10) and long[] (Java 11+) … … 208 208 throws IllegalAccessException, InvocationTargetException { 209 209 if (regOpenKey == null || regQueryInfoKey == null || regEnumKeyEx == null || regCloseKey == null) { 210 return null;210 return Collections.emptyList(); 211 211 } 212 212 List<String> results = new ArrayList<>();
Note:
See TracChangeset
for help on using the changeset viewer.