Changeset 19139 in josm
Legend:
- Unmodified
- Added
- Removed
-
trunk/scripts/SyncEditorLayerIndex.java
r19137 r19139 283 283 if (outputStream != null) { 284 284 try { 285 outputStream.write(s + System. getProperty("line.separator"));285 outputStream.write(s + System.lineSeparator()); 286 286 } catch (IOException e) { 287 287 throw new JosmRuntimeException(e); … … 386 386 myprintln("*** Loaded "+eliEntries.size()+" entries (ELI). ***"); 387 387 } 388 388 389 void loadELIUsers() throws IOException { 389 390 try (JsonReader jr = Json.createReader(Files.newBufferedReader(Paths.get(idInputFile), UTF_8))) { … … 635 636 for (String l : le) { 636 637 String e = ""; 637 if (idUrls.get(l) != null && rapidUrls.get(l) != null)638 if (idUrls.get(l) != null && rapidUrls.get(l) != null) 638 639 e = " **iD+Rapid**"; 639 else if (idUrls.get(l) != null)640 else if (idUrls.get(l) != null) 640 641 e = " **iD**"; 641 else if (rapidUrls.get(l) != null)642 else if (rapidUrls.get(l) != null) 642 643 e = " **Rapid**"; 643 644 myprintln("- " + getDescription(eliUrls.get(l)) + e); … … 1372 1373 return p.getString("url"); 1373 1374 else 1374 return ((JsonObject) e).getString("template");1375 return ((JsonObject) e).getString("template"); 1375 1376 } 1376 1377 -
trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java
r18549 r19139 15 15 /** 16 16 * Executor that displays the progress monitor to the user. 17 * 17 * <p> 18 18 * Similar to Executors.newSingleThreadExecutor(), but displays the 19 19 * progress monitor whenever a new task is executed. … … 29 29 public ProgressMonitorExecutor(final String nameFormat, final int threadPriority) { 30 30 super(1, 1, 0L, TimeUnit.MILLISECONDS, 31 new LinkedBlockingQueue< Runnable>(),31 new LinkedBlockingQueue<>(), 32 32 Utils.newThreadFactory(nameFormat, threadPriority)); 33 33 } -
trunk/src/org/openstreetmap/josm/tools/PlatformHook.java
r19120 r19139 404 404 if (missingArguments.length() > 0) { 405 405 final String args = missingArguments.toString(); 406 messages.add(tr("Missing JVM Arguments:<br>{0}<br>These arguments should be added in the command line or start script before the -jar parameter.", args)); 406 messages.add(tr("Missing JVM Arguments:<br>{0}<br>" + 407 "These arguments should be added in the command line or start script before the -jar parameter.", args)); 407 408 } 408 409 if (!messages.isEmpty()) {
Note:
See TracChangeset
for help on using the changeset viewer.