changeset in /hg/icedtea: Add support for disabling Nimbus code ...

Andrew John Hughes ahughes at redhat.com
Thu May 21 08:53:48 PDT 2009


changeset 5b10caa4c7fd in /hg/icedtea
details: http://icedtea.classpath.org/hg/icedtea?cmd=changeset;node=5b10caa4c7fd
description:
	Add support for disabling Nimbus code generation with JIBX and instead using pre-built files.

	2009-05-21  Andrew John Hughes  <ahughes at redhat.com>

		* Makefile.am:
		Apply patch and use our generated source directory
		when ENABLE_NIMBUS_GENERATION is not enabled.  Symlink
		JIBX when it is.
		* acinclude.m4:
		(AC_CHECK_ENABLE_NIMBUS_GENERATION): New macro.
		* configure.ac:
		Turn on ENABLE_NIMBUS_GENERATION and only check for
		JIBX when this is enabled.
		* generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java,
		* generated/javax/swing/plaf/nimbus/CheckBoxPainter.java,
		* generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java,
		* generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java,
		* generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java,
		* generated/javax/swing/plaf/nimbus/ComboBoxPainter.java,
		* generated/javax/swing/plaf/nimbus/DesktopIconPainter.java,
		* generated/javax/swing/plaf/nimbus/DesktopPanePainter.java,
		* generated/javax/swing/plaf/nimbus/EditorPanePainter.java,
		* generated/javax/swing/plaf/nimbus/FileChooserPainter.java,
		* generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java,
		* generated/javax/swing/plaf/nimbus/InternalFramePainter.java,
		* generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java,
		* generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java,
		* generated/javax/swing/plaf/nimbus/MenuBarPainter.java,
		* generated/javax/swing/plaf/nimbus/MenuItemPainter.java,
		* generated/javax/swing/plaf/nimbus/MenuPainter.java,
		* generated/javax/swing/plaf/nimbus/NimbusDefaults.java,
		* generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java,
		* generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java,
		* generated/javax/swing/plaf/nimbus/OptionPanePainter.java,
		* generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java,
		* generated/javax/swing/plaf/nimbus/PopupMenuPainter.java,
		* generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java,
		* generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java,
		* generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java,
		* generated/javax/swing/plaf/nimbus/ProgressBarPainter.java,
		* generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java,
		* generated/javax/swing/plaf/nimbus/RadioButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ScrollBarPainter.java,
		* generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java,
		* generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java,
		* generated/javax/swing/plaf/nimbus/ScrollPanePainter.java,
		* generated/javax/swing/plaf/nimbus/SeparatorPainter.java,
		* generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java,
		* generated/javax/swing/plaf/nimbus/SliderPainter.java,
		* generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java,
		* generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java,
		* generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java,
		* generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java,
		* generated/javax/swing/plaf/nimbus/SpinnerPainter.java,
		* generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java,
		* generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/SplitPanePainter.java,
		* generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java,
		* generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java,
		* generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java,
		* generated/javax/swing/plaf/nimbus/TabbedPanePainter.java,
		* generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java,
		* generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java,
		* generated/javax/swing/plaf/nimbus/TableEditorPainter.java,
		* generated/javax/swing/plaf/nimbus/TableHeaderPainter.java,
		* generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java,
		* generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java,
		* generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java,
		* generated/javax/swing/plaf/nimbus/TextAreaPainter.java,
		* generated/javax/swing/plaf/nimbus/TextFieldPainter.java,
		* generated/javax/swing/plaf/nimbus/TextPanePainter.java,
		* generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ToolBarEastState.java,
		* generated/javax/swing/plaf/nimbus/ToolBarNorthState.java,
		* generated/javax/swing/plaf/nimbus/ToolBarPainter.java,
		* generated/javax/swing/plaf/nimbus/ToolBarSouthState.java,
		* generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java,
		* generated/javax/swing/plaf/nimbus/ToolBarWestState.java,
		* generated/javax/swing/plaf/nimbus/ToolTipPainter.java,
		* generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java,
		* generated/javax/swing/plaf/nimbus/TreePainter.java,
		* generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java:
		Add generated Nimbus files.
		* patches/icedtea-stop-nimbus-generation.patch:
		Turn off building Nimbus tool when --disable-nimbus-generation
		is given.

diffstat:

91 files changed, 25386 insertions(+), 3 deletions(-)
ChangeLog                                                                                                                           |  102 
Makefile.am                                                                                                                         |   11 
acinclude.m4                                                                                                                        |   17 
configure.ac                                                                                                                        |   10 
generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java                                                                           |  118 
generated/javax/swing/plaf/nimbus/ButtonPainter.java                                                                                |  652 ++
generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java                                                                      |  162 
generated/javax/swing/plaf/nimbus/CheckBoxPainter.java                                                                              |  635 ++
generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java                                                     |   42 
generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java                                                           |  476 ++
generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java                                                             |  254 +
generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java                                                                        |   41 
generated/javax/swing/plaf/nimbus/ComboBoxPainter.java                                                                              |  733 +++
generated/javax/swing/plaf/nimbus/DesktopIconPainter.java                                                                           |  159 
generated/javax/swing/plaf/nimbus/DesktopPanePainter.java                                                                           |  350 +
generated/javax/swing/plaf/nimbus/EditorPanePainter.java                                                                            |  124 
generated/javax/swing/plaf/nimbus/FileChooserPainter.java                                                                           | 2248 ++++++++++
generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java                                                                    |  381 +
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java                  |  463 ++
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java    |   51 
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java                |  606 ++
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java  |   51 
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java               | 1045 ++++
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java  |   51 
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java |   51 
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java                   |  517 ++
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java     |   51 
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java                                                   |   88 
generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java                                        |   41 
generated/javax/swing/plaf/nimbus/InternalFramePainter.java                                                                         |  402 +
generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java                                                              |   41 
generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java                                                                           |  107 
generated/javax/swing/plaf/nimbus/MenuBarPainter.java                                                                               |  152 
generated/javax/swing/plaf/nimbus/MenuItemPainter.java                                                                              |  107 
generated/javax/swing/plaf/nimbus/MenuPainter.java                                                                                  |  157 
generated/javax/swing/plaf/nimbus/NimbusDefaults.java                                                                               | 1793 +++++++
generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java                                        |  105 
generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java                                                       |   88 
generated/javax/swing/plaf/nimbus/OptionPanePainter.java                                                                            |  583 ++
generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java                                                                         |  381 +
generated/javax/swing/plaf/nimbus/PopupMenuPainter.java                                                                             |  163 
generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java                                                                    |  105 
generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java                                                                     |   42 
generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java                                                                |   42 
generated/javax/swing/plaf/nimbus/ProgressBarPainter.java                                                                           |  612 ++
generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java                                                                   |  171 
generated/javax/swing/plaf/nimbus/RadioButtonPainter.java                                                                           |  704 +++
generated/javax/swing/plaf/nimbus/ScrollBarPainter.java                                                                             |   87 
generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java                                                              |  380 +
generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java                                                               |  379 +
generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java                                                               |  275 +
generated/javax/swing/plaf/nimbus/ScrollPanePainter.java                                                                            |  178 
generated/javax/swing/plaf/nimbus/SeparatorPainter.java                                                                             |  105 
generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java                                                                        |   40 
generated/javax/swing/plaf/nimbus/SliderPainter.java                                                                                |   87 
generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java                                                             |   40 
generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java                                                                     |  654 ++
generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java                                                             |   40 
generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java                                                                     |  229 +
generated/javax/swing/plaf/nimbus/SpinnerPainter.java                                                                               |   88 
generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java                                                 |  320 +
generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java                                                              |  582 ++
generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java                                                          |  504 ++
generated/javax/swing/plaf/nimbus/SplitPanePainter.java                                                                             |   88 
generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java                                                             |  289 +
generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java                                                       |   41 
generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java                                                                       |   41 
generated/javax/swing/plaf/nimbus/TabbedPanePainter.java                                                                            |   92 
generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java                                                           |  220 
generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java                                                               |  677 +++
generated/javax/swing/plaf/nimbus/TableEditorPainter.java                                                                           |  134 
generated/javax/swing/plaf/nimbus/TableHeaderPainter.java                                                                           |  140 
generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java                                                        |  380 +
generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java                                                    |   42 
generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java                                                                 |   41 
generated/javax/swing/plaf/nimbus/TextAreaPainter.java                                                                              |  411 +
generated/javax/swing/plaf/nimbus/TextFieldPainter.java                                                                             |  381 +
generated/javax/swing/plaf/nimbus/TextPanePainter.java                                                                              |  124 
generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java                                                                          |  705 +++
generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java                                                                         |  288 +
generated/javax/swing/plaf/nimbus/ToolBarEastState.java                                                                             |   43 
generated/javax/swing/plaf/nimbus/ToolBarNorthState.java                                                                            |   43 
generated/javax/swing/plaf/nimbus/ToolBarPainter.java                                                                               |  211 
generated/javax/swing/plaf/nimbus/ToolBarSouthState.java                                                                            |   43 
generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java                                                                   |  535 ++
generated/javax/swing/plaf/nimbus/ToolBarWestState.java                                                                             |   43 
generated/javax/swing/plaf/nimbus/ToolTipPainter.java                                                                               |  150 
generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java                                                                        |  143 
generated/javax/swing/plaf/nimbus/TreePainter.java                                                                                  |  652 ++
generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java                                                                          |  145 
patches/icedtea-stop-nimbus-generation.patch                                                                                        |   14 

diffs (truncated from 25797 to 500 lines):

diff -r 2afddd1c229e -r 5b10caa4c7fd ChangeLog
--- a/ChangeLog	Thu May 21 00:16:15 2009 +0100
+++ b/ChangeLog	Thu May 21 13:45:49 2009 +0100
@@ -1,3 +1,105 @@ 2009-05-21  Andrew John Hughes  <ahughes
+2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
+
+	* Makefile.am:
+	Apply patch and use our generated source directory
+	when ENABLE_NIMBUS_GENERATION is not enabled.  Symlink
+	JIBX when it is.
+	* acinclude.m4:
+	(AC_CHECK_ENABLE_NIMBUS_GENERATION): New macro.
+	* configure.ac:
+	Turn on ENABLE_NIMBUS_GENERATION and only check for
+	JIBX when this is enabled.
+	* generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/CheckBoxMenuItemPainter.java,
+	* generated/javax/swing/plaf/nimbus/CheckBoxPainter.java,
+	* generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonEditableState.java,
+	* generated/javax/swing/plaf/nimbus/ComboBoxComboBoxArrowButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ComboBoxComboBoxTextFieldPainter.java,
+	* generated/javax/swing/plaf/nimbus/ComboBoxEditableState.java,
+	* generated/javax/swing/plaf/nimbus/ComboBoxPainter.java,
+	* generated/javax/swing/plaf/nimbus/DesktopIconPainter.java,
+	* generated/javax/swing/plaf/nimbus/DesktopPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/EditorPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/FileChooserPainter.java,
+	* generated/javax/swing/plaf/nimbus/FormattedTextFieldPainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneCloseButtonWindowNotFocusedState.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneIconifyButtonWindowNotFocusedState.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowMaximizedState.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMaximizeButtonWindowNotFocusedState.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneInternalFrameTitlePaneMenuButtonWindowNotFocusedState.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePanePainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameInternalFrameTitlePaneWindowFocusedState.java,
+	* generated/javax/swing/plaf/nimbus/InternalFramePainter.java,
+	* generated/javax/swing/plaf/nimbus/InternalFrameWindowFocusedState.java,
+	* generated/javax/swing/plaf/nimbus/MenuBarMenuPainter.java,
+	* generated/javax/swing/plaf/nimbus/MenuBarPainter.java,
+	* generated/javax/swing/plaf/nimbus/MenuItemPainter.java,
+	* generated/javax/swing/plaf/nimbus/MenuPainter.java,
+	* generated/javax/swing/plaf/nimbus/NimbusDefaults.java,
+	* generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaOptionPaneLabelPainter.java,
+	* generated/javax/swing/plaf/nimbus/OptionPaneOptionPaneMessageAreaPainter.java,
+	* generated/javax/swing/plaf/nimbus/OptionPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/PasswordFieldPainter.java,
+	* generated/javax/swing/plaf/nimbus/PopupMenuPainter.java,
+	* generated/javax/swing/plaf/nimbus/PopupMenuSeparatorPainter.java,
+	* generated/javax/swing/plaf/nimbus/ProgressBarFinishedState.java,
+	* generated/javax/swing/plaf/nimbus/ProgressBarIndeterminateState.java,
+	* generated/javax/swing/plaf/nimbus/ProgressBarPainter.java,
+	* generated/javax/swing/plaf/nimbus/RadioButtonMenuItemPainter.java,
+	* generated/javax/swing/plaf/nimbus/RadioButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ScrollBarPainter.java,
+	* generated/javax/swing/plaf/nimbus/ScrollBarScrollBarButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ScrollBarScrollBarThumbPainter.java,
+	* generated/javax/swing/plaf/nimbus/ScrollBarScrollBarTrackPainter.java,
+	* generated/javax/swing/plaf/nimbus/ScrollPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/SeparatorPainter.java,
+	* generated/javax/swing/plaf/nimbus/SliderArrowShapeState.java,
+	* generated/javax/swing/plaf/nimbus/SliderPainter.java,
+	* generated/javax/swing/plaf/nimbus/SliderSliderThumbArrowShapeState.java,
+	* generated/javax/swing/plaf/nimbus/SliderSliderThumbPainter.java,
+	* generated/javax/swing/plaf/nimbus/SliderSliderTrackArrowShapeState.java,
+	* generated/javax/swing/plaf/nimbus/SliderSliderTrackPainter.java,
+	* generated/javax/swing/plaf/nimbus/SpinnerPainter.java,
+	* generated/javax/swing/plaf/nimbus/SpinnerPanelSpinnerFormattedTextFieldPainter.java,
+	* generated/javax/swing/plaf/nimbus/SpinnerSpinnerNextButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/SpinnerSpinnerPreviousButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/SplitPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerPainter.java,
+	* generated/javax/swing/plaf/nimbus/SplitPaneSplitPaneDividerVerticalState.java,
+	* generated/javax/swing/plaf/nimbus/SplitPaneVerticalState.java,
+	* generated/javax/swing/plaf/nimbus/TabbedPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabAreaPainter.java,
+	* generated/javax/swing/plaf/nimbus/TabbedPaneTabbedPaneTabPainter.java,
+	* generated/javax/swing/plaf/nimbus/TableEditorPainter.java,
+	* generated/javax/swing/plaf/nimbus/TableHeaderPainter.java,
+	* generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererPainter.java,
+	* generated/javax/swing/plaf/nimbus/TableHeaderTableHeaderRendererSortedState.java,
+	* generated/javax/swing/plaf/nimbus/TextAreaNotInScrollPaneState.java,
+	* generated/javax/swing/plaf/nimbus/TextAreaPainter.java,
+	* generated/javax/swing/plaf/nimbus/TextFieldPainter.java,
+	* generated/javax/swing/plaf/nimbus/TextPanePainter.java,
+	* generated/javax/swing/plaf/nimbus/ToggleButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarEastState.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarNorthState.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarPainter.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarSouthState.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarToggleButtonPainter.java,
+	* generated/javax/swing/plaf/nimbus/ToolBarWestState.java,
+	* generated/javax/swing/plaf/nimbus/ToolTipPainter.java,
+	* generated/javax/swing/plaf/nimbus/TreeCellEditorPainter.java,
+	* generated/javax/swing/plaf/nimbus/TreePainter.java,
+	* generated/javax/swing/plaf/nimbus/TreeTreeCellPainter.java:
+	Add generated Nimbus files.
+	* patches/icedtea-stop-nimbus-generation.patch:
+	Turn off building Nimbus tool when --disable-nimbus-generation
+	is given.
+
 2009-05-21  Andrew John Hughes  <ahughes at redhat.com>
 
 	* Makefile.am:
diff -r 2afddd1c229e -r 5b10caa4c7fd Makefile.am
--- a/Makefile.am	Thu May 21 00:16:15 2009 +0100
+++ b/Makefile.am	Thu May 21 13:45:49 2009 +0100
@@ -1495,6 +1495,11 @@ ICEDTEA_ENV += \
 	"ALT_JAR_CMD=$(ALT_JAR_CMD)"
 endif
 
+if !ENABLE_NIMBUS_GENERATION
+ICEDTEA_ENV += \
+	"GENSRCDIR=$(abs_top_builddir)/generated"
+endif
+
 env:
 	@echo 'unset JAVA_HOME'
 	@echo 'export $(ICEDTEA_ENV)'
@@ -2007,6 +2012,10 @@ ICEDTEA_PATCHES += patches/icedtea-syste
 ICEDTEA_PATCHES += patches/icedtea-systemtap.patch
 endif
 
+if !ENABLE_NIMBUS_GENERATION
+ICEDTEA_PATCHES += patches/icedtea-stop-nimbus-generation.patch
+endif
+
 stamps/extract.stamp: stamps/download.stamp
 if OPENJDK_SRC_DIR_FOUND
 	cp -a $(OPENJDK_SRC_DIR) openjdk
@@ -3039,11 +3048,13 @@ extra-lib/about.jar: stamps/extra-class-
 
 stamps/jibx.stamp: extra-lib/about.jar
 if ENABLE_NIMBUS
+if ENABLE_NIMBUS_GENERATION
 	mkdir $(JIBX_DEPS_DIR)
 	ln -s $(BCEL_JAR) $(JIBX_DEPS_DIR)
 	ln -s $(XPP3_JAR) $(JIBX_DEPS_DIR)
 	ln -s $(JIBX_DIR)/jibx-bind.jar $(JIBX_DEPS_DIR)
 	ln -s $(JIBX_DIR)/jibx-run.jar $(JIBX_DEPS_DIR)
+endif
 endif
 	mkdir -p stamps
 	touch $@
diff -r 2afddd1c229e -r 5b10caa4c7fd acinclude.m4
--- a/acinclude.m4	Thu May 21 00:16:15 2009 +0100
+++ b/acinclude.m4	Thu May 21 13:45:49 2009 +0100
@@ -1498,3 +1498,20 @@ AC_LANG_POP([C++])
 
 AC_SUBST(MOZILLA_VERSION_COLLAPSED, $xulrunner_cv_collapsed_version)
 ])
+
+AC_DEFUN([AC_CHECK_ENABLE_NIMBUS_GENERATION],
+[
+  AC_MSG_CHECKING(whether to generate the Nimbus source files using JIBX)
+  AC_ARG_ENABLE([nimbus-generation],
+	      [AS_HELP_STRING(--enable-nimbus-generation,generate the Nimbus source with JIBX [[default=yes]])],
+  [
+    ENABLE_NIMBUS_GENERATION="${enableval}"
+  ],
+  [
+    ENABLE_NIMBUS_GENERATION=yes
+  ])
+
+  AC_MSG_RESULT(${ENABLE_NIMBUS_GENERATION})
+  AM_CONDITIONAL(ENABLE_NIMBUS_GENERATION, test x"${ENABLE_NIMBUS_GENERATION}" = "xyes")
+  AC_SUBST(ENABLE_NIMBUS_GENERATION)
+])
diff -r 2afddd1c229e -r 5b10caa4c7fd configure.ac
--- a/configure.ac	Thu May 21 00:16:15 2009 +0100
+++ b/configure.ac	Thu May 21 13:45:49 2009 +0100
@@ -310,6 +310,7 @@ AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
 AC_CHECK_ENABLE_NIMBUS
+AC_CHECK_ENABLE_NIMBUS_GENERATION
 ENABLE_OPTIMIZATIONS
 SET_SHARK_BUILD
 ENABLE_ZERO_BUILD
@@ -346,9 +347,12 @@ fi
 
 if test "x${ENABLE_NIMBUS}" = "xyes"
 then
-FIND_BCEL_JAR
-FIND_XPP3_JAR
-FIND_JIBX_DIR
+  if test "x${ENABLE_NIMBUS_GENERATION}" = "xyes"
+  then
+    FIND_BCEL_JAR
+    FIND_XPP3_JAR
+    FIND_JIBX_DIR
+  fi
 fi
 
 dnl pkgconfig cannot be used to find these headers and libraries.
diff -r 2afddd1c229e -r 5b10caa4c7fd generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/javax/swing/plaf/nimbus/ArrowButtonPainter.java	Thu May 21 13:45:49 2009 +0100
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package javax.swing.plaf.nimbus;
+
+import java.awt.*;
+import java.awt.geom.*;
+import java.awt.image.*;
+import javax.swing.*;
+import javax.swing.Painter;
+
+
+public final class ArrowButtonPainter extends AbstractRegionPainter {
+    //package private integers representing the available states that
+    //this painter will paint. These are used when creating a new instance
+    //of ArrowButtonPainter to determine which region/state is being painted
+    //by that instance.
+    static final int BACKGROUND_ENABLED = 1;
+    static final int FOREGROUND_DISABLED = 2;
+    static final int FOREGROUND_ENABLED = 3;
+
+
+    private int state; //refers to one of the static final ints above
+    private PaintContext ctx;
+
+    //the following 4 variables are reused during the painting code of the layers
+    private Path2D path = new Path2D.Float();
+    private Rectangle2D rect = new Rectangle2D.Float(0, 0, 0, 0);
+    private RoundRectangle2D roundRect = new RoundRectangle2D.Float(0, 0, 0, 0, 0, 0);
+    private Ellipse2D ellipse = new Ellipse2D.Float(0, 0, 0, 0);
+
+    //All Colors used for painting are stored here. Ideally, only those colors being used
+    //by a particular instance of ArrowButtonPainter would be created. For the moment at least,
+    //however, all are created for each instance.
+    private Color color1 = decodeColor("nimbusBase", 0.027408898f, -0.57391655f, 0.1490196f, 0);
+    private Color color2 = decodeColor("nimbusBase", -0.57865167f, -0.6357143f, -0.37254906f, 0);
+
+
+    //Array of current component colors, updated in each paint call
+    private Object[] componentColors;
+
+    public ArrowButtonPainter(PaintContext ctx, int state) {
+        super();
+        this.state = state;
+        this.ctx = ctx;
+    }
+
+    @Override
+    protected void doPaint(Graphics2D g, JComponent c, int width, int height, Object[] extendedCacheKeys) {
+        //populate componentColors array with colors calculated in getExtendedCacheKeys call
+        componentColors = extendedCacheKeys;
+        //generate this entire method. Each state/bg/fg/border combo that has
+        //been painted gets its own KEY and paint method.
+        switch(state) {
+            case FOREGROUND_DISABLED: paintForegroundDisabled(g); break;
+            case FOREGROUND_ENABLED: paintForegroundEnabled(g); break;
+
+        }
+    }
+        
+
+
+    @Override
+    protected final PaintContext getPaintContext() {
+        return ctx;
+    }
+
+    private void paintForegroundDisabled(Graphics2D g) {
+        path = decodePath1();
+        g.setPaint(color1);
+        g.fill(path);
+
+    }
+
+    private void paintForegroundEnabled(Graphics2D g) {
+        path = decodePath1();
+        g.setPaint(color2);
+        g.fill(path);
+
+    }
+
+
+
+    private Path2D decodePath1() {
+        path.reset();
+        path.moveTo(decodeX(1.8f), decodeY(1.2f));
+        path.lineTo(decodeX(1.2f), decodeY(1.5f));
+        path.lineTo(decodeX(1.8f), decodeY(1.8f));
+        path.lineTo(decodeX(1.8f), decodeY(1.2f));
+        path.closePath();
+        return path;
+    }
+
+
+
+
+}
diff -r 2afddd1c229e -r 5b10caa4c7fd generated/javax/swing/plaf/nimbus/ButtonPainter.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/generated/javax/swing/plaf/nimbus/ButtonPainter.java	Thu May 21 13:45:49 2009 +0100
@@ -0,0 +1,652 @@
+/*
+ * Copyright 2005-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+package javax.swing.plaf.nimbus;
+
+import java.awt.*;
+import java.awt.geom.*;
+import java.awt.image.*;
+import javax.swing.*;
+import javax.swing.Painter;
+
+
+public final class ButtonPainter extends AbstractRegionPainter {
+    //package private integers representing the available states that
+    //this painter will paint. These are used when creating a new instance
+    //of ButtonPainter to determine which region/state is being painted
+    //by that instance.
+    static final int BACKGROUND_DEFAULT = 1;
+    static final int BACKGROUND_DEFAULT_FOCUSED = 2;
+    static final int BACKGROUND_MOUSEOVER_DEFAULT = 3;
+    static final int BACKGROUND_MOUSEOVER_DEFAULT_FOCUSED = 4;
+    static final int BACKGROUND_PRESSED_DEFAULT = 5;
+    static final int BACKGROUND_PRESSED_DEFAULT_FOCUSED = 6;
+    static final int BACKGROUND_DISABLED = 7;
+    static final int BACKGROUND_ENABLED = 8;
+    static final int BACKGROUND_FOCUSED = 9;
+    static final int BACKGROUND_MOUSEOVER = 10;
+    static final int BACKGROUND_MOUSEOVER_FOCUSED = 11;
+    static final int BACKGROUND_PRESSED = 12;
+    static final int BACKGROUND_PRESSED_FOCUSED = 13;
+
+
+    private int state; //refers to one of the static final ints above
+    private PaintContext ctx;
+
+    //the following 4 variables are reused during the painting code of the layers
+    private Path2D path = new Path2D.Float();
+    private Rectangle2D rect = new Rectangle2D.Float(0, 0, 0, 0);
+    private RoundRectangle2D roundRect = new RoundRectangle2D.Float(0, 0, 0, 0, 0, 0);
+    private Ellipse2D ellipse = new Ellipse2D.Float(0, 0, 0, 0);
+
+    //All Colors used for painting are stored here. Ideally, only those colors being used
+    //by a particular instance of ButtonPainter would be created. For the moment at least,
+    //however, all are created for each instance.
+    private Color color1 = decodeColor("nimbusBlueGrey", -0.027777791f, -0.06885965f, -0.36862746f, -190);
+    private Color color2 = decodeColor("nimbusBase", 5.1498413E-4f, -0.34585923f, -0.007843137f, 0);
+    private Color color3 = decodeColor("nimbusBase", 5.1498413E-4f, -0.095173776f, -0.25882354f, 0);
+    private Color color4 = decodeColor("nimbusBase", 0.004681647f, -0.6197143f, 0.43137252f, 0);
+    private Color color5 = decodeColor("nimbusBase", 0.004681647f, -0.5766426f, 0.38039213f, 0);
+    private Color color6 = decodeColor("nimbusBase", 5.1498413E-4f, -0.43866998f, 0.24705881f, 0);
+    private Color color7 = decodeColor("nimbusBase", 5.1498413E-4f, -0.46404046f, 0.36470586f, 0);
+    private Color color8 = decodeColor("nimbusBase", 5.1498413E-4f, -0.47761154f, 0.44313723f, 0);
+    private Color color9 = decodeColor("nimbusFocus", 0.0f, 0.0f, 0.0f, 0);
+    private Color color10 = decodeColor("nimbusBase", 0.0013483167f, -0.1769987f, -0.12156865f, 0);
+    private Color color11 = decodeColor("nimbusBase", 0.059279382f, 0.3642857f, -0.43529415f, 0);
+    private Color color12 = decodeColor("nimbusBase", 0.004681647f, -0.6198413f, 0.43921566f, 0);
+    private Color color13 = decodeColor("nimbusBase", -0.0017285943f, -0.5822163f, 0.40392154f, 0);
+    private Color color14 = decodeColor("nimbusBase", 5.1498413E-4f, -0.4555341f, 0.3215686f, 0);
+    private Color color15 = decodeColor("nimbusBase", 5.1498413E-4f, -0.47698414f, 0.43921566f, 0);
+    private Color color16 = decodeColor("nimbusBase", -0.06415892f, -0.5455182f, 0.45098037f, 0);
+    private Color color17 = decodeColor("nimbusBlueGrey", 0.0f, -0.110526316f, 0.25490195f, -95);
+    private Color color18 = decodeColor("nimbusBase", -0.57865167f, -0.6357143f, -0.54901963f, 0);
+    private Color color19 = decodeColor("nimbusBase", -3.528595E-5f, 0.018606722f, -0.23137257f, 0);
+    private Color color20 = decodeColor("nimbusBase", -4.2033195E-4f, -0.38050595f, 0.20392156f, 0);
+    private Color color21 = decodeColor("nimbusBase", 0.001903832f, -0.29863563f, 0.1490196f, 0);
+    private Color color22 = decodeColor("nimbusBase", 0.0f, 0.0f, 0.0f, 0);
+    private Color color23 = decodeColor("nimbusBase", 0.0018727183f, -0.14126986f, 0.15686274f, 0);
+    private Color color24 = decodeColor("nimbusBase", 8.9377165E-4f, -0.20852983f, 0.2588235f, 0);
+    private Color color25 = decodeColor("nimbusBlueGrey", -0.027777791f, -0.06885965f, -0.36862746f, -232);
+    private Color color26 = decodeColor("nimbusBlueGrey", 0.0f, -0.06766917f, 0.07843137f, 0);
+    private Color color27 = decodeColor("nimbusBlueGrey", 0.0f, -0.06484103f, 0.027450979f, 0);
+    private Color color28 = decodeColor("nimbusBlueGrey", 0.0f, -0.08477524f, 0.16862744f, 0);
+    private Color color29 = decodeColor("nimbusBlueGrey", -0.015872955f, -0.080091536f, 0.15686274f, 0);
+    private Color color30 = decodeColor("nimbusBlueGrey", 0.0f, -0.07016757f, 0.12941176f, 0);
+    private Color color31 = decodeColor("nimbusBlueGrey", 0.0f, -0.07052632f, 0.1372549f, 0);
+    private Color color32 = decodeColor("nimbusBlueGrey", 0.0f, -0.070878744f, 0.14509803f, 0);
+    private Color color33 = decodeColor("nimbusBlueGrey", -0.055555522f, -0.05356429f, -0.12549019f, 0);
+    private Color color34 = decodeColor("nimbusBlueGrey", 0.0f, -0.0147816315f, -0.3764706f, 0);
+    private Color color35 = decodeColor("nimbusBlueGrey", 0.055555582f, -0.10655806f, 0.24313724f, 0);
+    private Color color36 = decodeColor("nimbusBlueGrey", 0.0f, -0.09823123f, 0.2117647f, 0);
+    private Color color37 = decodeColor("nimbusBlueGrey", 0.0f, -0.0749532f, 0.24705881f, 0);
+    private Color color38 = decodeColor("nimbusBlueGrey", 0.0f, -0.110526316f, 0.25490195f, 0);
+    private Color color39 = decodeColor("nimbusBlueGrey", 0.0f, -0.020974077f, -0.21960783f, 0);
+    private Color color40 = decodeColor("nimbusBlueGrey", 0.0f, 0.11169591f, -0.53333336f, 0);
+    private Color color41 = decodeColor("nimbusBlueGrey", 0.055555582f, -0.10658931f, 0.25098038f, 0);
+    private Color color42 = decodeColor("nimbusBlueGrey", 0.0f, -0.098526314f, 0.2352941f, 0);
+    private Color color43 = decodeColor("nimbusBlueGrey", 0.0f, -0.07333623f, 0.20392156f, 0);
+    private Color color44 = new Color(245, 250, 255, 160);
+    private Color color45 = decodeColor("nimbusBlueGrey", 0.055555582f, 0.8894737f, -0.7176471f, 0);
+    private Color color46 = decodeColor("nimbusBlueGrey", 0.0f, 5.847961E-4f, -0.32156864f, 0);
+    private Color color47 = decodeColor("nimbusBlueGrey", -0.00505054f, -0.05960039f, 0.10196078f, 0);
+    private Color color48 = decodeColor("nimbusBlueGrey", -0.008547008f, -0.04772438f, 0.06666666f, 0);
+    private Color color49 = decodeColor("nimbusBlueGrey", -0.0027777553f, -0.0018306673f, -0.02352941f, 0);
+    private Color color50 = decodeColor("nimbusBlueGrey", -0.0027777553f, -0.0212406f, 0.13333333f, 0);
+    private Color color51 = decodeColor("nimbusBlueGrey", 0.0055555105f, -0.030845039f, 0.23921567f, 0);
+
+
+    //Array of current component colors, updated in each paint call
+    private Object[] componentColors;
+
+    public ButtonPainter(PaintContext ctx, int state) {
+        super();
+        this.state = state;
+        this.ctx = ctx;
+    }
+
+    @Override
+    protected void doPaint(Graphics2D g, JComponent c, int width, int height, Object[] extendedCacheKeys) {
+        //populate componentColors array with colors calculated in getExtendedCacheKeys call
+        componentColors = extendedCacheKeys;
+        //generate this entire method. Each state/bg/fg/border combo that has
+        //been painted gets its own KEY and paint method.
+        switch(state) {
+            case BACKGROUND_DEFAULT: paintBackgroundDefault(g); break;
+            case BACKGROUND_DEFAULT_FOCUSED: paintBackgroundDefaultAndFocused(g); break;
+            case BACKGROUND_MOUSEOVER_DEFAULT: paintBackgroundMouseOverAndDefault(g); break;
+            case BACKGROUND_MOUSEOVER_DEFAULT_FOCUSED: paintBackgroundMouseOverAndDefaultAndFocused(g); break;
+            case BACKGROUND_PRESSED_DEFAULT: paintBackgroundPressedAndDefault(g); break;
+            case BACKGROUND_PRESSED_DEFAULT_FOCUSED: paintBackgroundPressedAndDefaultAndFocused(g); break;
+            case BACKGROUND_DISABLED: paintBackgroundDisabled(g); break;
+            case BACKGROUND_ENABLED: paintBackgroundEnabled(g); break;
+            case BACKGROUND_FOCUSED: paintBackgroundFocused(g); break;
+            case BACKGROUND_MOUSEOVER: paintBackgroundMouseOver(g); break;
+            case BACKGROUND_MOUSEOVER_FOCUSED: paintBackgroundMouseOverAndFocused(g); break;
+            case BACKGROUND_PRESSED: paintBackgroundPressed(g); break;
+            case BACKGROUND_PRESSED_FOCUSED: paintBackgroundPressedAndFocused(g); break;
+
+        }
+    }
+        
+    protected Object[] getExtendedCacheKeys(JComponent c) {
+        Object[] extendedCacheKeys = null;
+        switch(state) {
+            case BACKGROUND_DEFAULT:
+                extendedCacheKeys = new Object[] {
+                     getComponentColor(c, "background", color4, -0.6197143f, 0.43137252f, 0),
+                     getComponentColor(c, "background", color5, -0.5766426f, 0.38039213f, 0),
+                     getComponentColor(c, "background", color6, -0.43866998f, 0.24705881f, 0),
+                     getComponentColor(c, "background", color7, -0.46404046f, 0.36470586f, 0),
+                     getComponentColor(c, "background", color8, -0.47761154f, 0.44313723f, 0)};
+                break;
+            case BACKGROUND_DEFAULT_FOCUSED:
+                extendedCacheKeys = new Object[] {
+                     getComponentColor(c, "background", color4, -0.6197143f, 0.43137252f, 0),
+                     getComponentColor(c, "background", color5, -0.5766426f, 0.38039213f, 0),
+                     getComponentColor(c, "background", color6, -0.43866998f, 0.24705881f, 0),
+                     getComponentColor(c, "background", color7, -0.46404046f, 0.36470586f, 0),
+                     getComponentColor(c, "background", color8, -0.47761154f, 0.44313723f, 0)};
+                break;
+            case BACKGROUND_MOUSEOVER_DEFAULT:
+                extendedCacheKeys = new Object[] {
+                     getComponentColor(c, "background", color12, -0.6198413f, 0.43921566f, 0),
+                     getComponentColor(c, "background", color13, -0.5822163f, 0.40392154f, 0),



More information about the distro-pkg-dev mailing list