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

Timestamp:

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

trunk/src/org/openstreetmap/josm/gui/MainFrame.java

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.ComponentOrientation;
+import java.awt.Frame;
 import java.awt.Image;
 import java.awt.Rectangle;
@@ -24 +25 @@
 import javax.swing.JFrame;
 import javax.swing.JPanel;
+import javax.swing.WindowConstants;
 
 import org.openstreetmap.josm.data.UserIdentityManager;
@@ -55 +57 @@
 
     protected transient WindowGeometry geometry;
-    protected int windowState = JFrame.NORMAL;
+    protected int windowState = Frame.NORMAL;
     private final MainPanel panel;
     private MainMenu menu;
@@ -111 +113 @@
         setIconImages(l);
         addWindowListener(new ExitWindowAdapter());
-        setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
+        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 
         // This listener is never removed, since the main frame exists forever.
@@ -131 +133 @@
              geometry.remember(WindowGeometry.PREF_KEY_GUI_GEOMETRY);
         }
-        Config.getPref().putBoolean("gui.maximized", (windowState & JFrame.MAXIMIZED_BOTH) != 0);
+        Config.getPref().putBoolean("gui.maximized", (windowState & Frame.MAXIMIZED_BOTH) != 0);
     }
 
@@ -162 +164 @@
     public void setMaximized(boolean maximized) {
         if (maximized) {
-            if (Toolkit.getDefaultToolkit().isFrameStateSupported(JFrame.MAXIMIZED_BOTH)) {
-                windowState = JFrame.MAXIMIZED_BOTH;
+            if (Toolkit.getDefaultToolkit().isFrameStateSupported(Frame.MAXIMIZED_BOTH)) {
+                windowState = Frame.MAXIMIZED_BOTH;
                 setExtendedState(windowState);
             } else {
@@ -229 +231 @@
     }
 
-    private class WindowPositionSizeListener extends WindowAdapter implements ComponentListener {
+    private final class WindowPositionSizeListener extends WindowAdapter implements ComponentListener {
         @Override
         public void windowStateChanged(WindowEvent e) {
@@ -258 +260 @@
             Component c = e.getComponent();
             if (c instanceof JFrame && c.isVisible()) {
-                if (windowState == JFrame.NORMAL) {
+                if (windowState == Frame.NORMAL) {
                     geometry = new WindowGeometry((JFrame) c);
                 } else {