Changeset 19139 in josm

Timestamp:

2024-07-12T13:36:39+02:00 (3 weeks ago)

Author:

taylor.smock

Message:

PMD and checkstyle fixes

Location:

trunk

Files:

• scripts/SyncEditorLayerIndex.java (modified) (4 diffs)
• src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java (modified) (2 diffs)
• src/org/openstreetmap/josm/tools/PlatformHook.java (modified) (1 diff)

trunk/scripts/SyncEditorLayerIndex.java

@@ -283 +283 @@
         if (outputStream != null) {
             try {
-                outputStream.write(s + System.getProperty("line.separator"));
+                outputStream.write(s + System.lineSeparator());
             } catch (IOException e) {
                 throw new JosmRuntimeException(e);
@@ -386 +386 @@
         myprintln("*** Loaded "+eliEntries.size()+" entries (ELI). ***");
     }
+
     void loadELIUsers() throws IOException {
         try (JsonReader jr = Json.createReader(Files.newBufferedReader(Paths.get(idInputFile), UTF_8))) {
@@ -635 +636 @@
             for (String l : le) {
                 String e = "";
-                if(idUrls.get(l) != null && rapidUrls.get(l) != null)
+                if (idUrls.get(l) != null && rapidUrls.get(l) != null)
                     e = " **iD+Rapid**";
-                else if(idUrls.get(l) != null)
+                else if (idUrls.get(l) != null)
                     e = " **iD**";
-                else if(rapidUrls.get(l) != null)
+                else if (rapidUrls.get(l) != null)
                     e = " **Rapid**";
                 myprintln("-  " + getDescription(eliUrls.get(l)) + e);
@@ -1372 +1373 @@
             return p.getString("url");
         else
-            return ((JsonObject)e).getString("template");
+            return ((JsonObject) e).getString("template");
     }
 

trunk/src/org/openstreetmap/josm/gui/progress/swing/ProgressMonitorExecutor.java

@@ -15 +15 @@
 /**
  * Executor that displays the progress monitor to the user.
- *
+ * <p>
  * Similar to Executors.newSingleThreadExecutor(), but displays the
  * progress monitor whenever a new task is executed.
@@ -29 +29 @@
     public ProgressMonitorExecutor(final String nameFormat, final int threadPriority) {
         super(1, 1, 0L, TimeUnit.MILLISECONDS,
-                new LinkedBlockingQueue<Runnable>(),
+                new LinkedBlockingQueue<>(),
                 Utils.newThreadFactory(nameFormat, threadPriority));
     }

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

@@ -404 +404 @@
         if (missingArguments.length() > 0) {
             final String args = missingArguments.toString();
-            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));
+            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));
         }
         if (!messages.isEmpty()) {