diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | javax/swing/plaf/basic/BasicOptionPaneUI.java | 8 |
2 files changed, 13 insertions, 6 deletions
@@ -1,5 +1,16 @@ 2005-07-15 Roman Kennke <roman@kennke.org> + * javax/swing/plaf/basic/BasicOptionPaneUI.java + (ButtonAreaLayout): Made class static. + (ButtonAreaLayout.setSyncAllWidths): Removed revalidate(). Never + ever revalidate something within a LayoutManager! + (ButtonAreaLayout.setPadding): Likewise. + (ButtonAreaLayout.setCentersChildren): Likewise. + (ButtonAreaLayout.layoutContainer): Don't refer to enclosing + class's instance, this is not allowed in static inner classes. + +2005-07-15 Roman Kennke <roman@kennke.org> + * javax/swing/plaf/metal/MetalCheckBoxIcon.java: New class. An icon implementation for use in JCheckBoxes. * javax/swing/plaf/metal/MetalBorders.java diff --git a/javax/swing/plaf/basic/BasicOptionPaneUI.java b/javax/swing/plaf/basic/BasicOptionPaneUI.java index 4d587ab72..ce29f24b4 100644 --- a/javax/swing/plaf/basic/BasicOptionPaneUI.java +++ b/javax/swing/plaf/basic/BasicOptionPaneUI.java @@ -161,8 +161,7 @@ public class BasicOptionPaneUI extends OptionPaneUI * but was made public by a compiler bug and is now * public for compatibility. */ - // FIXME: should be static - public class ButtonAreaLayout implements LayoutManager + public static class ButtonAreaLayout implements LayoutManager { /** Whether this layout will center the buttons. */ protected boolean centersChildren = true; @@ -249,7 +248,7 @@ public class BasicOptionPaneUI extends OptionPaneUI for (int i = 0; i < buttonList.length; i++) { Dimension dims = buttonList[i].getPreferredSize(); - if (getSizeButtonsToSameWidth()) + if (syncAllWidths) { buttonList[i].setBounds(x, 0, widthOfWidestButton, dims.height); x += widthOfWidestButton + getPadding(); @@ -347,7 +346,6 @@ public class BasicOptionPaneUI extends OptionPaneUI public void setCentersChildren(boolean newValue) { centersChildren = newValue; - optionPane.invalidate(); } /** @@ -358,7 +356,6 @@ public class BasicOptionPaneUI extends OptionPaneUI public void setPadding(int newPadding) { padding = newPadding; - optionPane.invalidate(); } /** @@ -369,7 +366,6 @@ public class BasicOptionPaneUI extends OptionPaneUI public void setSyncAllWidths(boolean newValue) { syncAllWidths = newValue; - optionPane.invalidate(); } } |