Index: trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 13034)
+++ trunk/src/org/openstreetmap/josm/gui/dialogs/MapPaintDialog.java	(revision 13036)
@@ -27,5 +27,4 @@
 
 import javax.swing.AbstractAction;
-import javax.swing.DefaultButtonModel;
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.ImageIcon;
@@ -39,4 +38,5 @@
 import javax.swing.JTabbedPane;
 import javax.swing.JTable;
+import javax.swing.JToggleButton.ToggleButtonModel;
 import javax.swing.ListSelectionModel;
 import javax.swing.SingleSelectionModel;
@@ -126,5 +126,5 @@
         wfLabel.setLabelFor(cbWireframe);
 
-        cbWireframe.setModel(new DefaultButtonModel() {
+        cbWireframe.setModel(new ToggleButtonModel() {
             @Override
             public void setSelected(boolean b) {
Index: trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 13034)
+++ trunk/src/org/openstreetmap/josm/gui/widgets/QuadStateCheckBox.java	(revision 13036)
@@ -133,6 +133,6 @@
      * It previously only implemented (and still could) the {@code ButtonModel} interface.
      * But because of JDK-8182577 (Java 9 regression) it now extends {@code ToggleButtonModel} as a workaround.
-     * The previous implementation can be restored after Java 10 migration.
-     * See also https://bugs.openjdk.java.net/browse/JDK-8182695
+     * The previous implementation can be restored after Java 9 EOL (March 2018).
+     * See also https://bugs.openjdk.java.net/browse/JDK-8182695 - https://bugs.openjdk.java.net/browse/JDK-8182577
      */
     private final class QuadStateDecorator extends ToggleButtonModel {