Changeset 18311 in josm for trunk

Timestamp:

2021-11-06T21:52:13+01:00 (2 years ago)

Author:

Don-vip

Message:

fix #21488 - make our custom checkbox models extend ToggleButtonModel so that Java 8u311 is happy

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/MapPaintDialog.java (modified) (3 diffs)
• widgets/QuadStateCheckBox.java (modified) (1 diff)

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

@@ -27 +27 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.DefaultButtonModel;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.ImageIcon;
@@ -38 +37 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JToggleButton.ToggleButtonModel;
 import javax.swing.ListSelectionModel;
 import javax.swing.SingleSelectionModel;
@@ -126 +126 @@
         wfLabel.setLabelFor(cbWireframe);
 
-        cbWireframe.setModel(new DefaultButtonModel() {
+        cbWireframe.setModel(new ToggleButtonModel() {
             @Override
             public void setSelected(boolean b) {

trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java

@@ -152 +152 @@
      * Button model for the {@code QuadStateCheckBox}.
      */
-    private final class QuadStateDecorator implements ButtonModel {
+    private final class QuadStateDecorator extends ToggleButtonModel {
         private final ButtonModel other;
         private String propertyText;