Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/tools/Logging.java

Timestamp:

2024-04-22T20:59:26+02:00 (2 years ago)

Author:

taylor.smock

Message:

Revert most var changes from r19048, fix most new compile warnings and checkstyle issues

Also, document why various ErrorProne checks were originally disabled and fix
generic SonarLint issues.

File:

• trunk/src/org/openstreetmap/josm/tools/Logging.java (modified) (4 diffs)

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

@@ -130 +130 @@
 
         @Override
-        public synchronized void publish(LogRecord record) {
-            if (this.prioritizedHandler == null || !this.prioritizedHandler.isLoggable(record)) {
-                super.publish(record);
+        public synchronized void publish(LogRecord logRecord) {
+            if (this.prioritizedHandler == null || !this.prioritizedHandler.isLoggable(logRecord)) {
+                super.publish(logRecord);
             }
         }
@@ -481 +481 @@
     }
 
-    private static class RememberWarningHandler extends Handler {
+    private static final class RememberWarningHandler extends Handler {
         private final String[] log = new String[10];
         private int messagesLogged;
@@ -491 +491 @@
 
         @Override
-        public synchronized void publish(LogRecord record) {
+        public synchronized void publish(LogRecord logRecord) {
             // We don't use setLevel + isLoggable to work in WebStart Sandbox mode
-            if (record.getLevel().intValue() < LEVEL_WARN.intValue()) {
+            if (logRecord.getLevel().intValue() < LEVEL_WARN.intValue()) {
                 return;
             }
 
-            String msg = String.format(Locale.ROOT, "%09.3f %s%s", startup.elapsed() / 1000., getPrefix(record), record.getMessage());
+            String msg = String.format(Locale.ROOT, "%09.3f %s%s", startup.elapsed() / 1000., getPrefix(logRecord), logRecord.getMessage());
 
             // Only remember first line of message
@@ -508 +508 @@
         }
 
-        private static String getPrefix(LogRecord record) {
-            if (record.getLevel().equals(LEVEL_WARN)) {
+        private static String getPrefix(LogRecord logRecord) {
+            if (logRecord.getLevel().equals(LEVEL_WARN)) {
                 return "W: ";
             } else {