Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

Timestamp:

2024-04-22T20:59:26+02:00 (7 months 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/io/session/SessionReader.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -574 +574 @@
                         tr("Unable to load layer"),
                         tr("Cannot load layer of type ''{0}'' because no suitable importer was found.", type),
-                        JOptionPane.WARNING_MESSAGE,
-                        progressMonitor
-                        );
+                        JOptionPane.WARNING_MESSAGE
+                );
                 if (dialog.isCancel()) {
                     progressMonitor.cancel();
@@ -593 +592 @@
                                 tr("Unable to load layer"),
                                 tr("Cannot load layer {0} because it depends on layer {1} which has been skipped.", idx, d),
-                                JOptionPane.WARNING_MESSAGE,
-                                progressMonitor
-                                );
+                                JOptionPane.WARNING_MESSAGE
+                        );
                         if (dialog.isCancel()) {
                             progressMonitor.cancel();
@@ -625 +623 @@
                                         Utils.escapeReservedCharactersHTML(name),
                                         Utils.escapeReservedCharactersHTML(exception.getMessage())),
-                                JOptionPane.ERROR_MESSAGE,
-                                progressMonitor
-                                );
+                                JOptionPane.ERROR_MESSAGE
+                        );
                         if (dialog.isCancel()) {
                             progressMonitor.cancel();
@@ -735 +732 @@
      * needed to block the current thread and wait for the result of the modal dialog from EDT.
      */
-    private static class CancelOrContinueDialog {
+    private static final class CancelOrContinueDialog {
 
         private boolean cancel;
 
-        public void show(final String title, final String message, final int icon, final ProgressMonitor progressMonitor) {
+        void show(final String title, final String message, final int icon) {
             try {
                 SwingUtilities.invokeAndWait(() -> {