Changeset 19050 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

Timestamp:

2024-04-22T20:59:26+02:00 (6 weeks 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/gui/dialogs/ConflictResolutionDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java

@@ -16 +16 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 
 import org.openstreetmap.josm.data.UndoRedoHandler;
@@ -34 +35 @@
     /** the conflict resolver component */
     private final ConflictResolver resolver = new ConflictResolver();
-    private final JLabel titleLabel = new JLabel("", null, JLabel.CENTER);
+    private final JLabel titleLabel = new JLabel("", null, SwingConstants.CENTER);
 
     private final ApplyResolutionAction applyResolutionAction = new ApplyResolutionAction();
@@ -196 +197 @@
                         options[1]
                 );
-                switch(ret) {
+                switch (ret) {
                 case JOptionPane.YES_OPTION:
                     buttonAction(1, evt);