/[debian]/libjgoodies-looks-java/trunk/debian/patches/02_windows.patch
ViewVC logotype

Diff of /libjgoodies-looks-java/trunk/debian/patches/02_windows.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1326 by gregoa, Thu Jun 5 22:42:46 2008 UTC revision 1381 by gregoa, Fri Jul 25 19:07:03 2008 UTC
# Line 1  Line 1 
1  Author: <gregor+debian@comodo.priv.at>  Author: <gregor+debian@comodo.priv.at>
2  Description: remove windows look  Description: remove windows look
3  --- libjgoodies-looks-java.orig/build.xml  --- a/build.xml
4  +++ libjgoodies-looks-java/build.xml  +++ b/build.xml
5  @@ -90,7 +90,7 @@  @@ -94,7 +94,7 @@
6       <!-- C O M P I L A T I O N                                             -->       <!-- C O M P I L A T I O N                                             -->
7       <!-- ***************************************************************** -->       <!-- ***************************************************************** -->
8          <target name="compile"          <target name="compile"
# Line 11  Description: remove windows look Line 11  Description: remove windows look
11                  description="Compiles the l&amp;fs, demo, and tests." />                  description="Compiles the l&amp;fs, demo, and tests." />
12                                    
13       <!-- ***************************************************************** -->       <!-- ***************************************************************** -->
14  @@ -115,33 +115,11 @@  @@ -119,33 +119,11 @@
15                  <copy toDir="${build.core.dir}" >                  <copy toDir="${build.core.dir}" >
16                          <fileset dir="${src.core.dir}"                          <fileset dir="${src.core.dir}"
17                                           includes="com/jgoodies/looks/common/shadow.png,                                           includes="com/jgoodies/looks/common/shadow.png,
# Line 46  Description: remove windows look Line 46  Description: remove windows look
46       <target name="compile-tests" depends="compile-core" if="junit.jar.present"       <target name="compile-tests" depends="compile-core" if="junit.jar.present"
47               description="Compiles the unit tests." >               description="Compiles the unit tests." >
48           <mkdir dir="${build.test.dir}"/>           <mkdir dir="${build.test.dir}"/>
49  @@ -209,7 +187,7 @@  @@ -213,7 +191,7 @@
50       <!-- J A R                                                                        -->       <!-- J A R                                                                        -->
51       <!-- ***************************************************************** -->       <!-- ***************************************************************** -->
52          <target name="jar"          <target name="jar"
# Line 55  Description: remove windows look Line 55  Description: remove windows look
55                  description="Creates library and example jars." >                  description="Creates library and example jars." >
56          </target>          </target>
57                    
58  @@ -264,20 +242,6 @@  @@ -268,20 +246,6 @@
59          </target>          </target>
60                    
61       <!-- ***************************************************************** -->       <!-- ***************************************************************** -->
# Line 76  Description: remove windows look Line 76  Description: remove windows look
76          <target name="jar-demo" depends="jar-plastic"          <target name="jar-demo" depends="jar-plastic"
77                  description="Creates the demo jar." >                  description="Creates the demo jar." >
78                  <jar                  <jar
79  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/Options.java  --- a/src/core/com/jgoodies/looks/Options.java
80  +++ libjgoodies-looks-java/src/core/com/jgoodies/looks/Options.java  +++ b/src/core/com/jgoodies/looks/Options.java
81  @@ -38,8 +38,6 @@  @@ -40,8 +40,6 @@
82    
83   import com.jgoodies.looks.common.ShadowPopup;   import com.jgoodies.looks.common.ShadowPopup;
84   import com.jgoodies.looks.plastic.PlasticLookAndFeel;   import com.jgoodies.looks.plastic.PlasticLookAndFeel;
# Line 86  Description: remove windows look Line 86  Description: remove windows look
86  -import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;  -import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;
87    
88   /**   /**
89    * Provides access to optional features of the JGoodies L&amp;Fs    * Provides access to optional features of the JGoodies L&amp;Fs
90  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsArrowButton.java  --- a/src/core/com/jgoodies/looks/windows/WindowsArrowButton.java
91  +++ /dev/null  +++ /dev/null
92  @@ -1,142 +0,0 @@  @@ -1,142 +0,0 @@
93  -/*  -/*
94  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
95  - *  - *
96  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
97  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
98  - *  - *
99  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
100  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
101  - *      - *
102  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
103  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
104  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
105  - *      - *
106  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
107  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
108  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
109  - *      - *
110  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
111  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
112  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
113  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
114  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
115  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
116  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
117  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
118  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
119  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
120  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
121  - */  - */
122  -  -
123  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 130  Description: remove windows look Line 130  Description: remove windows look
130  -import javax.swing.plaf.basic.BasicArrowButton;  -import javax.swing.plaf.basic.BasicArrowButton;
131  -  -
132  -/**  -/**
133  - * The JGoodies Windows Look&amp;Feel implementation for  - * The JGoodies Windows Look&amp;Feel implementation for
134  - * arrow buttons used in scrollbars and comboboxes.  - * arrow buttons used in scrollbars and comboboxes.
135  - * <p>  - * <p>
136  - * It differs from <code>BasicArrowButton</code> in that the preferred size  - * It differs from <code>BasicArrowButton</code> in that the preferred size
137  - * is always a square.  - * is always a square.
138  - * It differs from <code>WindowsScrollBarUI.WindowsArrowButton</code>  - * It differs from <code>WindowsScrollBarUI.WindowsArrowButton</code>
139  - * in that the triangle is black and positioned correctly.  - * in that the triangle is black and positioned correctly.
140  - *  - *
141  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
142  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
143  - */  - */
144  -final class WindowsArrowButton extends BasicArrowButton {  -final class WindowsArrowButton extends BasicArrowButton {
145  -  -
# Line 232  Description: remove windows look Line 232  Description: remove windows look
232  -        g.setColor(oldColor);  -        g.setColor(oldColor);
233  -    }  -    }
234  -}  -}
235  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsBorders.java  --- a/src/core/com/jgoodies/looks/windows/WindowsBorders.java
236  +++ /dev/null  +++ /dev/null
237  @@ -1,589 +0,0 @@  @@ -1,584 +0,0 @@
238  -/*  -/*
239  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
240  - *  - *
241  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
242  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
243  - *  - *
244  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
245  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
246  - *      - *
247  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
248  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
249  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
250  - *      - *
251  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
252  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
253  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
254  - *      - *
255  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
256  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
257  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
258  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
259  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
260  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
261  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
262  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
263  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
264  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
265  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
266  - */  - */
267  -  -
268  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 272  Description: remove windows look Line 272  Description: remove windows look
272  -import java.awt.Graphics;  -import java.awt.Graphics;
273  -import java.awt.Insets;  -import java.awt.Insets;
274  -  -
275  -import javax.swing.AbstractButton;  -import javax.swing.*;
 -import javax.swing.ButtonModel;  
 -import javax.swing.JButton;  
 -import javax.swing.JToggleButton;  
 -import javax.swing.UIDefaults;  
 -import javax.swing.UIManager;  
276  -import javax.swing.border.AbstractBorder;  -import javax.swing.border.AbstractBorder;
277  -import javax.swing.border.Border;  -import javax.swing.border.Border;
278  -import javax.swing.border.CompoundBorder;  -import javax.swing.border.CompoundBorder;
# Line 288  Description: remove windows look Line 283  Description: remove windows look
283  -import javax.swing.plaf.basic.BasicGraphicsUtils;  -import javax.swing.plaf.basic.BasicGraphicsUtils;
284  -  -
285  -/**  -/**
286  - * Consists of static inner classes that define different  - * Consists of static inner classes that define different
287  - * <code>Borders</code> used in the JGoodies Windows look&amp;feel.  - * <code>Borders</code> used in the JGoodies Windows look&amp;feel.
288  - *  - *
289  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
290  - * @version $Revision: 1.5 $  - * @version $Revision: 1.7 $
291  - */  - */
292  -final class WindowsBorders {  -final class WindowsBorders {
293  -      -
294  -    private WindowsBorders() {  -    private WindowsBorders() {
295  -        // Overrides default constructor; prevents instantiation.  -        // Overrides default constructor; prevents instantiation.
296  -    }  -    }
297  -      -
298  -       // Accessing and Creating Borders ***************************************************  -       // Accessing and Creating Borders ***************************************************
299  -  -
300  -    private static Border menuBorder;  -    private static Border menuBorder;
# Line 388  Description: remove windows look Line 383  Description: remove windows look
383  -    }  -    }
384  -  -
385  -    /**  -    /**
386  -     * Returns a special border for a <code>JMenuBar</code> that  -     * Returns a special border for a <code>JMenuBar</code> that
387  -     * is used in a header just above a <code>JToolBar</code>.  -     * is used in a header just above a <code>JToolBar</code>.
388  -     */  -     */
389  -    static Border getMenuBarHeaderBorder() {  -    static Border getMenuBarHeaderBorder() {
# Line 402  Description: remove windows look Line 397  Description: remove windows look
397  -  -
398  -    /**  -    /**
399  -     * Returns a border instance for a <code>JPopupMenu</code>.  -     * Returns a border instance for a <code>JPopupMenu</code>.
400  -     *  -     *
401  -     * @return the lazily created popup menu border  -     * @return the lazily created popup menu border
402  -     */  -     */
403  -    static Border getPopupMenuBorder() {  -    static Border getPopupMenuBorder() {
# Line 414  Description: remove windows look Line 409  Description: remove windows look
409  -  -
410  -    /**  -    /**
411  -     * Returns a no-margin border instance for a <code>JPopupMenu</code>.  -     * Returns a no-margin border instance for a <code>JPopupMenu</code>.
412  -     *  -     *
413  -     * @return the lazily created no-margin popup menu border  -     * @return the lazily created no-margin popup menu border
414  -     */  -     */
415  -    static Border getNoMarginPopupMenuBorder() {  -    static Border getNoMarginPopupMenuBorder() {
# Line 425  Description: remove windows look Line 420  Description: remove windows look
420  -    }  -    }
421  -  -
422  -    /**  -    /**
423  -     * Returns a special border for a <code>JToolBar</code> that  -     * Returns a special border for a <code>JToolBar</code> that
424  -     * is used in a header just below a <code>JMenuBar</code>.  -     * is used in a header just below a <code>JMenuBar</code>.
425  -     */  -     */
426  -    static Border getToolBarHeaderBorder() {  -    static Border getToolBarHeaderBorder() {
427  -               if (toolBarHeaderBorder == null) {  -               if (toolBarHeaderBorder == null) {
428  -               toolBarHeaderBorder = new BorderUIResource.CompoundBorderUIResource(  -               toolBarHeaderBorder = new BorderUIResource.CompoundBorderUIResource(
429  -                                                                               new ToolBarHeaderBorder(),  -                                                                               new ToolBarHeaderBorder(),
430  -                                                                               new BasicBorders.MarginBorder());  -                                                                               new BasicBorders.MarginBorder());
# Line 441  Description: remove windows look Line 436  Description: remove windows look
436  -     * Returns a border for a rollover <code>AbstractButton</code>.  -     * Returns a border for a rollover <code>AbstractButton</code>.
437  -     */  -     */
438  -    static Border getRolloverButtonBorder() {  -    static Border getRolloverButtonBorder() {
439  -               if (rolloverButtonBorder == null) {  -               if (rolloverButtonBorder == null) {
440  -            rolloverButtonBorder = new CompoundBorder( // No UIResource  -            rolloverButtonBorder = new CompoundBorder( // No UIResource
441  -                                        new RolloverButtonBorder(),  -                                        new RolloverButtonBorder(),
442  -                                        new RolloverMarginBorder());  -                                        new RolloverMarginBorder());
# Line 455  Description: remove windows look Line 450  Description: remove windows look
450  -  -
451  -       // Copied from BasicBorders, has correct black color for the outer default rectangle.  -       // Copied from BasicBorders, has correct black color for the outer default rectangle.
452  -   private static final class ButtonBorder extends AbstractBorder implements UIResource {  -   private static final class ButtonBorder extends AbstractBorder implements UIResource {
453  -        -
454  -               private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);  -               private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
455  -                -
456  -        private final Color shadow;  -        private final Color shadow;
457  -        private final Color darkShadow;  -        private final Color darkShadow;
458  -        private final Color highlight;  -        private final Color highlight;
459  -        private final Color lightHighlight;  -        private final Color lightHighlight;
460  -        private final Color defaultColor;  -        private final Color defaultColor;
461  -  -
462  -        public ButtonBorder(Color shadow, Color darkShadow,  -        public ButtonBorder(Color shadow, Color darkShadow,
463  -                             Color highlight, Color lightHighlight, Color defaultColor) {  -                             Color highlight, Color lightHighlight, Color defaultColor) {
464  -            this.shadow = shadow;  -            this.shadow = shadow;
465  -            this.darkShadow = darkShadow;  -            this.darkShadow = darkShadow;
466  -            this.highlight = highlight;  -            this.highlight = highlight;
467  -            this.lightHighlight = lightHighlight;  -            this.lightHighlight = lightHighlight;
468  -            this.defaultColor = defaultColor;  -            this.defaultColor = defaultColor;
469  -        }  -        }
# Line 476  Description: remove windows look Line 471  Description: remove windows look
471  -        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {  -        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
472  -            boolean isPressed = false;  -            boolean isPressed = false;
473  -            boolean isDefault = false;  -            boolean isDefault = false;
474  -        -
475  -            if (c instanceof AbstractButton) {  -            if (c instanceof AbstractButton) {
476  -                       AbstractButton b = (AbstractButton) c;  -                       AbstractButton b = (AbstractButton) c;
477  -                       ButtonModel model = b.getModel();  -                       ButtonModel model = b.getModel();
478  -        -
479  -                       isPressed = model.isPressed() && model.isArmed();  -                       isPressed = model.isPressed() && model.isArmed();
480  -                if (c instanceof JButton) {  -                if (c instanceof JButton) {
481  -                    isDefault = ((JButton) c).isDefaultButton();  -                    isDefault = ((JButton) c).isDefaultButton();
482  -                }  -                }
483  -            }    -            }
484  -            drawBezel(g, x, y, width, height, isPressed, isDefault, shadow,  -            drawBezel(g, x, y, width, height, isPressed, isDefault, shadow,
485  -                      darkShadow, highlight, lightHighlight, defaultColor);  -                      darkShadow, highlight, lightHighlight, defaultColor);
486  -        }  -        }
# Line 526  Description: remove windows look Line 521  Description: remove windows look
521  -  -
522  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
523  -       }  -       }
524  -        -
525  -  -
526  -       /**  -       /**
527  -        * A border used for <code>Buttons</code> that have the rollover property enabled.  -        * A border used for <code>Buttons</code> that have the rollover property enabled.
528  -        */  -        */
529  -       private static final class RolloverButtonBorder extends AbstractButtonBorder {  -       private static final class RolloverButtonBorder extends AbstractButtonBorder {
530  -                -
531  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
532  -                       AbstractButton b = (AbstractButton) c;  -                       AbstractButton b = (AbstractButton) c;
533  -                       ButtonModel model = b.getModel();  -                       ButtonModel model = b.getModel();
# Line 568  Description: remove windows look Line 563  Description: remove windows look
563  -    private static final class RolloverMarginBorder extends EmptyBorder {  -    private static final class RolloverMarginBorder extends EmptyBorder {
564  -  -
565  -        private RolloverMarginBorder() {  -        private RolloverMarginBorder() {
566  -            super(1, 1, 1, 1);  -            super(1, 1, 1, 1);
567  -        }  -        }
568  -  -
569  -  -
# Line 602  Description: remove windows look Line 597  Description: remove windows look
597  -  -
598  -       /**  -       /**
599  -        * A border that looks like a separator line; used for menu bars and tool bars.  -        * A border that looks like a separator line; used for menu bars and tool bars.
600  -        */      -        */
601  -       private static final class SeparatorBorder extends AbstractBorder implements UIResource {  -       private static final class SeparatorBorder extends AbstractBorder implements UIResource {
602  -  -
603  -               private static final Insets INSETS = new Insets(0, 3, 2, 1);  -               private static final Insets INSETS = new Insets(0, 3, 2, 1);
# Line 616  Description: remove windows look Line 611  Description: remove windows look
611  -                       g.drawLine( 0, h - 1, w - 1, h - 1 );  -                       g.drawLine( 0, h - 1, w - 1, h - 1 );
612  -                       g.translate(-x, -y);  -                       g.translate(-x, -y);
613  -               }  -               }
614  -                -
615  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
616  -       }  -       }
617  -  -
618  -  -
619  -       /**  -       /**
620  -        * A thin raised border.  -        * A thin raised border.
621  -        */      -        */
622  -       static final class ThinRaisedBorder extends AbstractBorder implements UIResource {  -       static final class ThinRaisedBorder extends AbstractBorder implements UIResource {
623  -  -
624  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);
# Line 631  Description: remove windows look Line 626  Description: remove windows look
626  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
627  -                       WindowsUtils.drawFlush3DBorder(g, x, y, w, h);  -                       WindowsUtils.drawFlush3DBorder(g, x, y, w, h);
628  -               }  -               }
629  -                -
630  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
631  -       }  -       }
632  -        -
633  -        -
634  -       /**  -       /**
635  -        * A thin lowered border.  -        * A thin lowered border.
636  -        */      -        */
637  -       static final class ThinLoweredBorder extends AbstractBorder implements UIResource {  -       static final class ThinLoweredBorder extends AbstractBorder implements UIResource {
638  -  -
639  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);
# Line 646  Description: remove windows look Line 641  Description: remove windows look
641  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
642  -                       WindowsUtils.drawPressed3DBorder(g, x, y, w, h);  -                       WindowsUtils.drawPressed3DBorder(g, x, y, w, h);
643  -               }  -               }
644  -                -
645  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
646  -       }  -       }
647  -        -
648  -        -
649  -       /**  -       /**
650  -        * A border used for menu bars and tool bars in <code>HeaderStyle.SINGLE</code>.  -        * A border used for menu bars and tool bars in <code>HeaderStyle.SINGLE</code>.
651  -        * The bar is wrapped by an inner thin raised border,  -        * The bar is wrapped by an inner thin raised border,
652  -        * which in turn is wrapped by an outer thin lowered border.  -        * which in turn is wrapped by an outer thin lowered border.
653  -        */      -        */
654  -       private static final class EtchedBorder extends AbstractBorder implements UIResource {  -       private static final class EtchedBorder extends AbstractBorder implements UIResource {
655  -  -
656  -               private static final Insets INSETS = new Insets(2, 2, 2, 2);  -               private static final Insets INSETS = new Insets(2, 2, 2, 2);
# Line 667  Description: remove windows look Line 662  Description: remove windows look
662  -  -
663  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
664  -       }  -       }
665  -        -
666  -        -
667  -       /**  -       /**
668  -        * A border used for menu bars in <code>HeaderStyle.BOTH</code>.  -        * A border used for menu bars in <code>HeaderStyle.BOTH</code>.
669  -        * The menu bar and tool bar are wrapped by a thin raised border,  -        * The menu bar and tool bar are wrapped by a thin raised border,
# Line 676  Description: remove windows look Line 671  Description: remove windows look
671  -        */  -        */
672  -       private static final class MenuBarHeaderBorder extends AbstractBorder implements UIResource {  -       private static final class MenuBarHeaderBorder extends AbstractBorder implements UIResource {
673  -  -
674  -               private static final Insets INSETS = new Insets(2, 2, 1, 2);    -               private static final Insets INSETS = new Insets(2, 2, 1, 2);
675  -  -
676  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
677  -                       WindowsUtils.drawPressed3DBorder(g, x, y, w, h + 1);  -                       WindowsUtils.drawPressed3DBorder(g, x, y, w, h + 1);
# Line 685  Description: remove windows look Line 680  Description: remove windows look
680  -  -
681  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
682  -       }  -       }
683  -        -
684  -        -
685  -    private static final class PopupMenuBorder extends AbstractBorder implements UIResource {  -    private static final class PopupMenuBorder extends AbstractBorder implements UIResource {
686  -  -
687  -        private static final Insets INSETS = new Insets(3, 3, 3, 3);  -        private static final Insets INSETS = new Insets(3, 3, 3, 3);
# Line 703  Description: remove windows look Line 698  Description: remove windows look
698  -  -
699  -        public Insets getBorderInsets(Component c) { return INSETS; }  -        public Insets getBorderInsets(Component c) { return INSETS; }
700  -    }  -    }
701  -      -
702  -  -
703  -    private static final class NoMarginPopupMenuBorder extends AbstractBorder implements UIResource {  -    private static final class NoMarginPopupMenuBorder extends AbstractBorder implements UIResource {
704  -  -
# Line 720  Description: remove windows look Line 715  Description: remove windows look
715  -  -
716  -        public Insets getBorderInsets(Component c) { return INSETS; }  -        public Insets getBorderInsets(Component c) { return INSETS; }
717  -    }  -    }
718  -      -
719  -       /**  -       /**
720  -        * A border used for tool bars in <code>HeaderStyle.BOTH</code>.  -        * A border used for tool bars in <code>HeaderStyle.BOTH</code>.
721  -        * The menu bar and tool bar are wrapped by a thin raised border,  -        * The menu bar and tool bar are wrapped by a thin raised border,
# Line 728  Description: remove windows look Line 723  Description: remove windows look
723  -        */  -        */
724  -       private static final class ToolBarHeaderBorder extends AbstractBorder implements UIResource {  -       private static final class ToolBarHeaderBorder extends AbstractBorder implements UIResource {
725  -  -
726  -               private static final Insets INSETS = new Insets(1, 2, 2, 2);    -               private static final Insets INSETS = new Insets(1, 2, 2, 2);
727  -  -
728  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
729  -                       WindowsUtils.drawPressed3DBorder(g, x, y - 1, w, h + 1);  -                       WindowsUtils.drawPressed3DBorder(g, x, y - 1, w, h + 1);
# Line 737  Description: remove windows look Line 732  Description: remove windows look
732  -  -
733  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
734  -       }  -       }
735  -        -
736  -        -
737  -       /**  -       /**
738  -        * A border used for menus.  -        * A border used for menus.
739  -        */  -        */
740  -       private static final class MenuBorder extends AbstractBorder implements UIResource {  -       private static final class MenuBorder extends AbstractBorder implements UIResource {
741  -                -
742  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);
743  -  -
744  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
# Line 758  Description: remove windows look Line 753  Description: remove windows look
753  -                               WindowsUtils.drawFlush3DBorder(g, x, y, w, h);  -                               WindowsUtils.drawFlush3DBorder(g, x, y, w, h);
754  -                       //}  -                       //}
755  -               }  -               }
756  -                -
757  -               public Insets getBorderInsets(Component c) { return INSETS; }  -               public Insets getBorderInsets(Component c) { return INSETS; }
758  -  -
759  -       }  -       }
# Line 767  Description: remove windows look Line 762  Description: remove windows look
762  -    // Helper Code **********************************************************************  -    // Helper Code **********************************************************************
763  -  -
764  -       // Copied from BasicGraphicsUtils, has an additional color for the default rectangle.  -       // Copied from BasicGraphicsUtils, has an additional color for the default rectangle.
765  -    private static void drawBezel(Graphics g, int x, int y, int w, int h,  -    private static void drawBezel(Graphics g, int x, int y, int w, int h,
766  -                                 boolean isPressed, boolean isDefault,  -                                 boolean isPressed, boolean isDefault,
767  -                                 Color shadow, Color darkShadow,  -                                 Color shadow, Color darkShadow,
768  -                                 Color highlight, Color lightHighlight, Color defaultColor)  -                                 Color highlight, Color lightHighlight, Color defaultColor)
769  -    {  -    {
770  -        Color oldColor = g.getColor();  // Make no net change to g  -        Color oldColor = g.getColor();  // Make no net change to g
771  -        g.translate(x, y);  -        g.translate(x, y);
772  -          -
773  -        if (isPressed && isDefault) {  -        if (isPressed && isDefault) {
774  -            g.setColor(darkShadow);  -            g.setColor(darkShadow);
775  -            g.drawRect(0, 0, w - 1, h - 1);  -            g.drawRect(0, 0, w - 1, h - 1);
# Line 784  Description: remove windows look Line 779  Description: remove windows look
779  -            BasicGraphicsUtils.drawLoweredBezel(g, x, y, w, h,  -            BasicGraphicsUtils.drawLoweredBezel(g, x, y, w, h,
780  -                             shadow, darkShadow, highlight, lightHighlight);  -                             shadow, darkShadow, highlight, lightHighlight);
781  -        } else if (isDefault) {  -        } else if (isDefault) {
782  -            g.setColor(defaultColor);        -            g.setColor(defaultColor);
783  -            g.drawRect(0, 0, w-1, h-1);  -            g.drawRect(0, 0, w-1, h-1);
784  -  -
785  -            g.setColor(lightHighlight);    -            g.setColor(lightHighlight);
786  -            g.drawLine(1, 1, 1, h-3);  -            g.drawLine(1, 1, 1, h-3);
787  -            g.drawLine(2, 1, w-3, 1);  -            g.drawLine(2, 1, w-3, 1);
788  -  -
# Line 799  Description: remove windows look Line 794  Description: remove windows look
794  -            g.drawLine(2, h-3, w-3, h-3);  -            g.drawLine(2, h-3, w-3, h-3);
795  -            g.drawLine(w-3, 2, w-3, h-4);  -            g.drawLine(w-3, 2, w-3, h-4);
796  -  -
797  -            g.setColor(darkShadow);          -            g.setColor(darkShadow);
798  -            g.drawLine(1, h-2, w-2, h-2);  -            g.drawLine(1, h-2, w-2, h-2);
799  -            g.drawLine(w-2, h-2, w-2, 1);  -            g.drawLine(w-2, h-2, w-2, 1);
800  -        } else {  -        } else {
801  -            g.setColor(lightHighlight);      -            g.setColor(lightHighlight);
802  -            g.drawLine(0, 0, 0, h-1);  -            g.drawLine(0, 0, 0, h-1);
803  -            g.drawLine(1, 0, w-2, 0);  -            g.drawLine(1, 0, w-2, 0);
804  -  -
# Line 815  Description: remove windows look Line 810  Description: remove windows look
810  -            g.drawLine(1, h-2, w-2, h-2);  -            g.drawLine(1, h-2, w-2, h-2);
811  -            g.drawLine(w-2, 1, w-2, h-3);  -            g.drawLine(w-2, 1, w-2, h-3);
812  -  -
813  -            g.setColor(darkShadow);          -            g.setColor(darkShadow);
814  -            g.drawLine(0, h-1, w-1, h-1);  -            g.drawLine(0, h-1, w-1, h-1);
815  -            g.drawLine(w-1, h-1, w-1, 0);  -            g.drawLine(w-1, h-1, w-1, 0);
816  -        }  -        }
# Line 824  Description: remove windows look Line 819  Description: remove windows look
819  -    }  -    }
820  -  -
821  -}  -}
822  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsButtonUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsButtonUI.java
823  +++ /dev/null  +++ /dev/null
824  @@ -1,71 +0,0 @@  @@ -1,71 +0,0 @@
825  -/*  -/*
826  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
827  - *  - *
828  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
829  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
830  - *  - *
831  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
832  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
833  - *      - *
834  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
835  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
836  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
837  - *      - *
838  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
839  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
840  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
841  - *      - *
842  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
843  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
844  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
845  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
846  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
847  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
848  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
849  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
850  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
851  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
852  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
853  - */  - */
854  -  -
855  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 868  Description: remove windows look Line 863  Description: remove windows look
863  -  -
864  -/**  -/**
865  - * The JGoodies Windows look&amp;feel implementation of <code>ButtonUI</code>.<p>  - * The JGoodies Windows look&amp;feel implementation of <code>ButtonUI</code>.<p>
866  - *  - *
867  - * Unlike its superclass it returns even and odd preferred heights.  - * Unlike its superclass it returns even and odd preferred heights.
868  - *  - *
869  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
870  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
871  - */  - */
872  -public final class WindowsButtonUI extends com.sun.java.swing.plaf.windows.WindowsButtonUI {  -public final class WindowsButtonUI extends com.sun.java.swing.plaf.windows.WindowsButtonUI {
873  -  -
# Line 899  Description: remove windows look Line 894  Description: remove windows look
894  -  -
895  -}  -}
896  \ No newline at end of file  \ No newline at end of file
897  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsComboBoxEditor.java  --- a/src/core/com/jgoodies/looks/windows/WindowsComboBoxEditor.java
898  +++ /dev/null  +++ /dev/null
899  @@ -1,71 +0,0 @@  @@ -1,71 +0,0 @@
900  -/*  -/*
901  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
902  - *  - *
903  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
904  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
905  - *  - *
906  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
907  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
908  - *      - *
909  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
910  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
911  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
912  - *      - *
913  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
914  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
915  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
916  - *      - *
917  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
918  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
919  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
920  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
921  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
922  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
923  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
924  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
925  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
926  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
927  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
928  - */  - */
929  -  -
930  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 939  Description: remove windows look Line 934  Description: remove windows look
934  -import com.jgoodies.looks.common.ComboBoxEditorTextField;  -import com.jgoodies.looks.common.ComboBoxEditorTextField;
935  -  -
936  -/**  -/**
937  - * The default editor for editable combo boxes in the  - * The default editor for editable combo boxes in the
938  - * JGoodies Windows Look&amp;Feel.<p>  - * JGoodies Windows Look&amp;Feel.<p>
939  - *  - *
940  - * It differs from its superclass in that the border is quite the same as for  - * It differs from its superclass in that the border is quite the same as for
941  - * text fields: a compound border with an inner <code>MarginBorder</code>.  - * text fields: a compound border with an inner <code>MarginBorder</code>.
942  - *  - *
943  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
944  - * @version $Revision: 1.6 $  - * @version $Revision: 1.8 $
945  - */  - */
946  -class WindowsComboBoxEditor extends BasicComboBoxEditor {  -class WindowsComboBoxEditor extends BasicComboBoxEditor {
947  -  -
# Line 967  Description: remove windows look Line 962  Description: remove windows look
962  -     */  -     */
963  -    static final class UIResource extends WindowsComboBoxEditor implements  -    static final class UIResource extends WindowsComboBoxEditor implements
964  -            javax.swing.plaf.UIResource {  -            javax.swing.plaf.UIResource {
965  -          -
966  -        UIResource(boolean isTableCellEditor) {  -        UIResource(boolean isTableCellEditor) {
967  -            super(isTableCellEditor);  -            super(isTableCellEditor);
968  -        }  -        }
969  -    }  -    }
970  -}  -}
971  \ No newline at end of file  \ No newline at end of file
972  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java
973  +++ /dev/null  +++ /dev/null
974  @@ -1,557 +0,0 @@  @@ -1,557 +0,0 @@
975  -/*  -/*
976  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
977  - *  - *
978  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
979  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
980  - *  - *
981  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
982  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
983  - *      - *
984  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
985  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
986  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
987  - *      - *
988  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
989  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
990  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
991  - *      - *
992  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
993  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
994  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
995  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
996  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
997  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
998  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
999  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
1000  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
1001  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
1002  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1003  - */  - */
1004  -  -
1005  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 1028  Description: remove windows look Line 1023  Description: remove windows look
1023  -import com.sun.java.swing.plaf.windows.WindowsTextFieldUI;  -import com.sun.java.swing.plaf.windows.WindowsTextFieldUI;
1024  -  -
1025  -/**  -/**
1026  - * The JGoodies Windows Look&amp;Feel implementation of  - * The JGoodies Windows Look&amp;Feel implementation of
1027  - * {@link javax.swing.plaf.ComboBoxUI}.  - * {@link javax.swing.plaf.ComboBoxUI}.
1028  - * Corrects the editor insets for editable combo boxes  - * Corrects the editor insets for editable combo boxes
1029  - * as well as the render insets for non-editable combos. And it has  - * as well as the render insets for non-editable combos. And it has
1030  - * the same height as text fields - unless you change the renderer.<p>  - * the same height as text fields - unless you change the renderer.<p>
1031  - *  - *
1032  - * Also, this class offers to use the combo's popup prototype display value  - * Also, this class offers to use the combo's popup prototype display value
1033  - * to compute the popup menu width. This is an optional feature of  - * to compute the popup menu width. This is an optional feature of
1034  - * the JGoodies Windows L&amp;f implemented via a client property key.  - * the JGoodies Windows L&amp;f implemented via a client property key.
1035  - *  - *
1036  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
1037  - * @version $Revision: 1.19 $  - * @version $Revision: 1.21 $
1038  - *  - *
1039  - * @see Options#COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY  - * @see Options#COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY
1040  - */  - */
1041  -public class WindowsComboBoxUI extends com.sun.java.swing.plaf.windows.WindowsComboBoxUI {  -public class WindowsComboBoxUI extends com.sun.java.swing.plaf.windows.WindowsComboBoxUI {
1042  -      -
1043  -    private static final String CELL_EDITOR_KEY = "JComboBox.isTableCellEditor";  -    private static final String CELL_EDITOR_KEY = "JComboBox.isTableCellEditor";
1044  -      -
1045  -    /**  -    /**
1046  -     * Used to determine the minimum height of a text field,  -     * Used to determine the minimum height of a text field,
1047  -     * which in turn is used to answer the combobox's minimum height.  -     * which in turn is used to answer the combobox's minimum height.
1048  -     */  -     */
1049  -    private static final JTextField PHANTOM = new JTextField("Phantom");  -    private static final JTextField PHANTOM = new JTextField("Phantom");
1050  -      -
1051  -    private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);  -    private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
1052  -    private static final Border EMPTY_BORDER = new EmptyBorder(EMPTY_INSETS);  -    private static final Border EMPTY_BORDER = new EmptyBorder(EMPTY_INSETS);
1053  -      -
1054  -      -
1055  -    private boolean tableCellEditor;  -    private boolean tableCellEditor;
1056  -    private PropertyChangeListener propertyChangeListener;  -    private PropertyChangeListener propertyChangeListener;
1057  -      -
1058  -      -
1059  -    // ************************************************************************  -    // ************************************************************************
1060  -      -
1061  -    public static ComponentUI createUI(JComponent b) {  -    public static ComponentUI createUI(JComponent b) {
1062  -        ensurePhantomHasWindowsUI();  -        ensurePhantomHasWindowsUI();
1063  -        return new WindowsComboBoxUI();  -        return new WindowsComboBoxUI();
1064  -    }  -    }
1065  -  -
1066  -      -
1067  -    /**  -    /**
1068  -     * Ensures that the phantom text field has a Windows text field UI.  -     * Ensures that the phantom text field has a Windows text field UI.
1069  -     */  -     */
# Line 1077  Description: remove windows look Line 1072  Description: remove windows look
1072  -            PHANTOM.updateUI();  -            PHANTOM.updateUI();
1073  -        }  -        }
1074  -    }  -    }
1075  -      -
1076  -      -
1077  -    // ************************************************************************  -    // ************************************************************************
1078  -      -
1079  -    public void installUI(JComponent c) {  -    public void installUI(JComponent c) {
1080  -        super.installUI(c);  -        super.installUI(c);
1081  -        tableCellEditor = isTableCellEditor();  -        tableCellEditor = isTableCellEditor();
1082  -    }    -    }
1083  -      -
1084  -    protected void installListeners() {  -    protected void installListeners() {
1085  -        super.installListeners();  -        super.installListeners();
1086  -        propertyChangeListener = new TableCellEditorPropertyChangeHandler();  -        propertyChangeListener = new TableCellEditorPropertyChangeHandler();
1087  -        comboBox.addPropertyChangeListener(CELL_EDITOR_KEY, propertyChangeListener);  -        comboBox.addPropertyChangeListener(CELL_EDITOR_KEY, propertyChangeListener);
1088  -    }  -    }
1089  -      -
1090  -    protected void uninstallListeners() {  -    protected void uninstallListeners() {
1091  -        super.uninstallListeners();  -        super.uninstallListeners();
1092  -        comboBox.removePropertyChangeListener(CELL_EDITOR_KEY, propertyChangeListener);  -        comboBox.removePropertyChangeListener(CELL_EDITOR_KEY, propertyChangeListener);
1093  -        propertyChangeListener = null;  -        propertyChangeListener = null;
1094  -    }  -    }
1095  -      -
1096  -      -
1097  -    /**  -    /**
1098  -     * Creates the arrow button that is to be used in the combo box.<p>  -     * Creates the arrow button that is to be used in the combo box.<p>
1099  -     *  -     *
1100  -     * Overridden to paint black triangles.  -     * Overridden to paint black triangles.
1101  -     */  -     */
1102  -    protected JButton createArrowButton() {  -    protected JButton createArrowButton() {
# Line 1109  Description: remove windows look Line 1104  Description: remove windows look
1104  -                    ? super.createArrowButton()  -                    ? super.createArrowButton()
1105  -                    : new WindowsArrowButton(SwingConstants.SOUTH);  -                    : new WindowsArrowButton(SwingConstants.SOUTH);
1106  -    }  -    }
1107  -      -
1108  -      -
1109  -    /**  -    /**
1110  -     * Creates the editor that is to be used in editable combo boxes.  -     * Creates the editor that is to be used in editable combo boxes.
1111  -     * This method only gets called if a custom editor has not already  -     * This method only gets called if a custom editor has not already
1112  -     * been installed in the JComboBox.  -     * been installed in the JComboBox.
1113  -     */  -     */
1114  -    protected ComboBoxEditor createEditor() {  -    protected ComboBoxEditor createEditor() {
# Line 1122  Description: remove windows look Line 1117  Description: remove windows look
1117  -  -
1118  -  -
1119  -    /**  -    /**
1120  -     * Creates a layout manager for managing the components which  -     * Creates a layout manager for managing the components which
1121  -     * make up the combo box.<p>  -     * make up the combo box.<p>
1122  -     *  -     *
1123  -     * Overriden to use a layout that has a fixed width arrow button.  -     * Overriden to use a layout that has a fixed width arrow button.
1124  -     *  -     *
1125  -     * @return an instance of a layout manager  -     * @return an instance of a layout manager
1126  -     */  -     */
1127  -    protected LayoutManager createLayoutManager() {  -    protected LayoutManager createLayoutManager() {
# Line 1140  Description: remove windows look Line 1135  Description: remove windows look
1135  -            editor.setBackground(UIManager.getColor("ComboBox.disabledBackground"));  -            editor.setBackground(UIManager.getColor("ComboBox.disabledBackground"));
1136  -        }  -        }
1137  -    }  -    }
1138  -          -
1139  -    /**  -    /**
1140  -     * Creates a ComboPopup that honors the optional combo popup display value  -     * Creates a ComboPopup that honors the optional combo popup display value
1141  -     * that is used to compute the popup menu width.  -     * that is used to compute the popup menu width.
1142  -     */  -     */
1143  -    protected ComboPopup createPopup() {  -    protected ComboPopup createPopup() {
1144  -        return new WindowsComboPopup(comboBox);  -        return new WindowsComboPopup(comboBox);
1145  -    }  -    }
1146  -      -
1147  -      -
1148  -    /**  -    /**
1149  -     * Creates the default renderer that will be used in a non-editiable combo  -     * Creates the default renderer that will be used in a non-editiable combo
1150  -     * box. A default renderer will used only if a renderer has not been  -     * box. A default renderer will used only if a renderer has not been
1151  -     * explicitly set with <code>setRenderer</code>.<p>  -     * explicitly set with <code>setRenderer</code>.<p>
1152  -     *  -     *
1153  -     * This method differs from the superclass implementation in that  -     * This method differs from the superclass implementation in that
1154  -     * it uses an empty border with the default left and right text insets,  -     * it uses an empty border with the default left and right text insets,
1155  -     * the same as used by a combo box editor.  -     * the same as used by a combo box editor.
1156  -     *  -     *
1157  -     * @return a <code>ListCellRender</code> used for the combo box  -     * @return a <code>ListCellRender</code> used for the combo box
1158  -     * @see javax.swing.JComboBox#setRenderer  -     * @see javax.swing.JComboBox#setRenderer
1159  -     */  -     */
# Line 1185  Description: remove windows look Line 1180  Description: remove windows look
1180  -        int buttonWidth = getEditableButtonWidth();  -        int buttonWidth = getEditableButtonWidth();
1181  -        size.width +=  insets.left + insets.right + buttonWidth;  -        size.width +=  insets.left + insets.right + buttonWidth;
1182  -        // The combo editor benefits from extra space for the caret.  -        // The combo editor benefits from extra space for the caret.
1183  -        // To make editable and non-editable equally wide,  -        // To make editable and non-editable equally wide,
1184  -        // we always add 1 pixel.  -        // we always add 1 pixel.
1185  -        size.width += 1;  -        size.width += 1;
1186  -          -
1187  -        // Honor corrections made in #paintCurrentValue  -        // Honor corrections made in #paintCurrentValue
1188  -        ListCellRenderer renderer = comboBox.getRenderer();  -        ListCellRenderer renderer = comboBox.getRenderer();
1189  -        if (renderer instanceof JComponent) {  -        if (renderer instanceof JComponent) {
# Line 1202  Description: remove windows look Line 1197  Description: remove windows look
1197  -            size.width += offsetLeft + offsetRight;  -            size.width += offsetLeft + offsetRight;
1198  -            //size.height += offsetTop + offsetBottom;  -            //size.height += offsetTop + offsetBottom;
1199  -        }  -        }
1200  -          -
1201  -        // The height is oriented on the JTextField height  -        // The height is oriented on the JTextField height
1202  -        Dimension textFieldSize = PHANTOM.getMinimumSize();  -        Dimension textFieldSize = PHANTOM.getMinimumSize();
1203  -        size.height = (LookUtils.IS_OS_WINDOWS_VISTA && !LookUtils.IS_LAF_WINDOWS_XP_ENABLED)  -        size.height = (LookUtils.IS_OS_WINDOWS_VISTA && !LookUtils.IS_LAF_WINDOWS_XP_ENABLED)
1204  -           ? textFieldSize.height  -           ? textFieldSize.height
1205  -           : Math.max(textFieldSize.height, size.height);  -           : Math.max(textFieldSize.height, size.height);
1206  -  -
1207  -        cachedMinimumSize.setSize(size.width, size.height);  -        cachedMinimumSize.setSize(size.width, size.height);
1208  -        isMinimumSizeDirty = false;  -        isMinimumSizeDirty = false;
1209  -          -
1210  -        return new Dimension(size);  -        return new Dimension(size);
1211  -    }  -    }
1212  -  -
# Line 1223  Description: remove windows look Line 1218  Description: remove windows look
1218  -        return getMinimumSize(c);  -        return getMinimumSize(c);
1219  -    }  -    }
1220  -  -
1221  -      -
1222  -    /**  -    /**
1223  -     * Paints the currently selected item.  -     * Paints the currently selected item.
1224  -     */  -     */
# Line 1265  Description: remove windows look Line 1260  Description: remove windows look
1260  -            bounds.width  -= offsetLeft + offsetRight - 1;  -            bounds.width  -= offsetLeft + offsetRight - 1;
1261  -            bounds.height -= offsetTop + offsetBottom;  -            bounds.height -= offsetTop + offsetBottom;
1262  -        }  -        }
1263  -          -
1264  -        c.setFont(comboBox.getFont());  -        c.setFont(comboBox.getFont());
1265  -        if (hasFocus && !isPopupVisible(comboBox) && !isVistaReadOnlyCombo) {  -        if (hasFocus && !isPopupVisible(comboBox) && !isVistaReadOnlyCombo) {
1266  -            c.setForeground(listBox.getSelectionForeground());  -            c.setForeground(listBox.getSelectionForeground());
# Line 1298  Description: remove windows look Line 1293  Description: remove windows look
1293  -                if ((width % 2) == 0) {  -                if ((width % 2) == 0) {
1294  -                    width += 1;  -                    width += 1;
1295  -                }  -                }
1296  -                WindowsUtils.drawRoundedDashedRect(g,  -                WindowsUtils.drawRoundedDashedRect(g,
1297  -                        originalBounds.x+1, originalBounds.y+1,  -                        originalBounds.x+1, originalBounds.y+1,
1298  -                        width, originalBounds.height-2);  -                        width, originalBounds.height-2);
1299  -            } /*else {  -            } /*else {
1300  -                BasicGraphicsUtils.drawDashedRect(g,  -                BasicGraphicsUtils.drawDashedRect(g,
# Line 1314  Description: remove windows look Line 1309  Description: remove windows look
1309  -            ((JComponent) c).setBorder(oldBorder);  -            ((JComponent) c).setBorder(oldBorder);
1310  -        }  -        }
1311  -    }  -    }
1312  -      -
1313  -    /**  -    /**
1314  -     * Checks and answer whether the border of the given renderer component  -     * Checks and answer whether the border of the given renderer component
1315  -     * can be removed temporarily, so the combo's selection background will  -     * can be removed temporarily, so the combo's selection background will
1316  -     * be consistent with the default renderer and native appearance.  -     * be consistent with the default renderer and native appearance.
1317  -     * This test is invoked from <code>#paintCurrentValue</code>.<p>  -     * This test is invoked from <code>#paintCurrentValue</code>.<p>
1318  -     *  -     *
1319  -     * It is safe to remove an EmptyBorder if the component doesn't override  -     * It is safe to remove an EmptyBorder if the component doesn't override
1320  -     * <code>#update</code>, <code>#paint</code> and <code>#paintBorder</code>.  -     * <code>#update</code>, <code>#paint</code> and <code>#paintBorder</code>.
1321  -     * Since we know the default renderer, we can remove its border.<p>  -     * Since we know the default renderer, we can remove its border.<p>
1322  -     *  -     *
1323  -     * Custom renderers may set a hint to make their border removable.  -     * Custom renderers may set a hint to make their border removable.
1324  -     * To do so, set the client property "isBorderRemovable"  -     * To do so, set the client property "isBorderRemovable"
1325  -     * to <code>Boolean.TRUE</code>. If this client property is set,  -     * to <code>Boolean.TRUE</code>. If this client property is set,
1326  -     * its value will be returned. If it is not set, <code>true</code> is returned  -     * its value will be returned. If it is not set, <code>true</code> is returned
1327  -     * if and only if the component's border is an EmptyBorder.  -     * if and only if the component's border is an EmptyBorder.
1328  -     *    -     *
1329  -     * @param rendererComponent  the renderer component to check  -     * @param rendererComponent  the renderer component to check
1330  -     * @return true if the component's border can be removed, false if not  -     * @return true if the component's border can be removed, false if not
1331  -     * @see #paintCurrentValue(Graphics, Rectangle, boolean)  -     * @see #paintCurrentValue(Graphics, Rectangle, boolean)
# Line 1344  Description: remove windows look Line 1339  Description: remove windows look
1339  -        Border border = rendererComponent.getBorder();  -        Border border = rendererComponent.getBorder();
1340  -        return border instanceof EmptyBorder;  -        return border instanceof EmptyBorder;
1341  -    }  -    }
1342  -      -
1343  -      -
1344  -    private boolean isVistaXPStyleReadOnlyCombo() {  -    private boolean isVistaXPStyleReadOnlyCombo() {
1345  -        return     LookUtils.IS_OS_WINDOWS_VISTA  -        return     LookUtils.IS_OS_WINDOWS_VISTA
1346  -                && LookUtils.IS_LAF_WINDOWS_XP_ENABLED  -                && LookUtils.IS_LAF_WINDOWS_XP_ENABLED
1347  -                && !comboBox.isEditable();  -                && !comboBox.isEditable();
1348  -    }  -    }
1349  -      -
1350  -      -
1351  -    /**  -    /**
1352  -     * Returns the area that is reserved for drawing the currently selected item.  -     * Returns the area that is reserved for drawing the currently selected item.
1353  -     */  -     */
# Line 1378  Description: remove windows look Line 1373  Description: remove windows look
1373  -                    height - (insets.top  + insets.bottom));  -                    height - (insets.top  + insets.bottom));
1374  -        }  -        }
1375  -    }  -    }
1376  -      -
1377  -  -
1378  -    // Helper Code ************************************************************  -    // Helper Code ************************************************************
1379  -      -
1380  -    /**  -    /**
1381  -     * Computes and returns the width of the arrow button in editable state.  -     * Computes and returns the width of the arrow button in editable state.
1382  -     *  -     *
1383  -     * @return the width of the arrow button in editable state  -     * @return the width of the arrow button in editable state
1384  -     */  -     */
1385  -    private int getEditableButtonWidth() {  -    private int getEditableButtonWidth() {
1386  -        return UIManager.getInt("ScrollBar.width");  -        return UIManager.getInt("ScrollBar.width");
1387  -    }  -    }
1388  -      -
1389  -    /**  -    /**
1390  -     * Checks and answers if this UI's combo has a client property  -     * Checks and answers if this UI's combo has a client property
1391  -     * that indicates that the combo is used as a table cell editor.  -     * that indicates that the combo is used as a table cell editor.
1392  -     *  -     *
1393  -     * @return <code>true</code> if the table cell editor client property  -     * @return <code>true</code> if the table cell editor client property
1394  -     *    is set to <code>Boolean.TRUE</code>, <code>false</code> otherwise  -     *    is set to <code>Boolean.TRUE</code>, <code>false</code> otherwise
1395  -     */  -     */
1396  -    private boolean isTableCellEditor() {  -    private boolean isTableCellEditor() {
1397  -        return Boolean.TRUE.equals(comboBox.getClientProperty(CELL_EDITOR_KEY));  -        return Boolean.TRUE.equals(comboBox.getClientProperty(CELL_EDITOR_KEY));
1398  -    }  -    }
1399  -      -
1400  -  -
1401  -    // Collaborator Classes ***************************************************  -    // Collaborator Classes ***************************************************
1402  -  -
1403  -    /**  -    /**
1404  -     * This layout manager handles the 'standard' layout of combo boxes.    -     * This layout manager handles the 'standard' layout of combo boxes.
1405  -     * It puts the arrow button to the right and the editor to the left.  -     * It puts the arrow button to the right and the editor to the left.
1406  -     * If there is no editor it still keeps the arrow button to the right.  -     * If there is no editor it still keeps the arrow button to the right.
1407  -     *  -     *
1408  -     * Overriden to use a fixed arrow button width.  -     * Overriden to use a fixed arrow button width.
1409  -     */  -     */
1410  -    private final class WindowsComboBoxLayoutManager  -    private final class WindowsComboBoxLayoutManager
1411  -        extends BasicComboBoxUI.ComboBoxLayoutManager {  -        extends BasicComboBoxUI.ComboBoxLayoutManager {
# Line 1444  Description: remove windows look Line 1439  Description: remove windows look
1439  -                editor.setBounds(rectangleForCurrentValue());  -                editor.setBounds(rectangleForCurrentValue());
1440  -            }  -            }
1441  -        }  -        }
1442  -      -
1443  -   }  -   }
1444  -      -
1445  -      -
1446  -    /**  -    /**
1447  -     * Differs from the BasicComboPopup in that it uses the standard  -     * Differs from the BasicComboPopup in that it uses the standard
1448  -     * popmenu border and honors an optional popup prototype display value.  -     * popmenu border and honors an optional popup prototype display value.
1449  -     */  -     */
1450  -    private static final class WindowsComboPopup extends BasicComboPopup {  -    private static final class WindowsComboPopup extends BasicComboPopup {
# Line 1459  Description: remove windows look Line 1454  Description: remove windows look
1454  -        }  -        }
1455  -  -
1456  -        /**  -        /**
1457  -         * Calculates the placement and size of the popup portion  -         * Calculates the placement and size of the popup portion
1458  -         * of the combo box based on the combo box location and  -         * of the combo box based on the combo box location and
1459  -         * the enclosing screen bounds. If no transformations are required,  -         * the enclosing screen bounds. If no transformations are required,
1460  -         * then the returned rectangle will have the same values  -         * then the returned rectangle will have the same values
1461  -         * as the parameters.<p>  -         * as the parameters.<p>
1462  -         *  -         *
1463  -         * In addition to the superclass behavior, this class offers  -         * In addition to the superclass behavior, this class offers
1464  -         * to use the combo's popup prototype display value to compute  -         * to use the combo's popup prototype display value to compute
1465  -         * the popup menu width. This is an optional feature of  -         * the popup menu width. This is an optional feature of
1466  -         * the JGoodies Windows L&amp;f implemented via a client property key.<p>  -         * the JGoodies Windows L&amp;f implemented via a client property key.<p>
1467  -         *  -         *
1468  -         * If a prototype is set, the popup width is the maximum of the  -         * If a prototype is set, the popup width is the maximum of the
1469  -         * combobox width and the prototype based popup width.  -         * combobox width and the prototype based popup width.
1470  -         * For the latter the renderer is used to render the prototype.  -         * For the latter the renderer is used to render the prototype.
1471  -         * The prototype based popup width is the prototype's width  -         * The prototype based popup width is the prototype's width
1472  -         * plus the scrollbar width - if any. The scrollbar test checks  -         * plus the scrollbar width - if any. The scrollbar test checks
1473  -         * if there are more items than the combo's maximum row count.    -         * if there are more items than the combo's maximum row count.
1474  -         *  -         *
1475  -         * @param px starting x location  -         * @param px starting x location
1476  -         * @param py starting y location  -         * @param py starting y location
1477  -         * @param pw starting width  -         * @param pw starting width
1478  -         * @param ph starting height  -         * @param ph starting height
1479  -         * @return a rectangle which represents the placement and size of the popup  -         * @return a rectangle which represents the placement and size of the popup
1480  -         *  -         *
1481  -         * @see Options#COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY  -         * @see Options#COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY
1482  -         * @see JComboBox#getMaximumRowCount()  -         * @see JComboBox#getMaximumRowCount()
1483  -         */  -         */
1484  -        protected Rectangle computePopupBounds(int px, int py, int pw, int ph) {  -        protected Rectangle computePopupBounds(int px, int py, int pw, int ph) {
1485  -            Rectangle defaultBounds = super.computePopupBounds(px, py, pw, ph);  -            Rectangle defaultBounds = super.computePopupBounds(px, py, pw, ph);
1486  -            Object popupPrototypeDisplayValue = comboBox.getClientProperty(  -            Object popupPrototypeDisplayValue = comboBox.getClientProperty(
1487  -                    Options.COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY);  -                    Options.COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY);
1488  -            if (popupPrototypeDisplayValue == null) {  -            if (popupPrototypeDisplayValue == null) {
1489  -                return defaultBounds;  -                return defaultBounds;
1490  -            }  -            }
1491  -          -
1492  -            ListCellRenderer renderer = list.getCellRenderer();  -            ListCellRenderer renderer = list.getCellRenderer();
1493  -            Component c = renderer.getListCellRendererComponent(  -            Component c = renderer.getListCellRendererComponent(
1494  -                    list, popupPrototypeDisplayValue, -1, true, true);  -                    list, popupPrototypeDisplayValue, -1, true, true);
1495  -            pw = c.getPreferredSize().width;  -            pw = c.getPreferredSize().width;
1496  -            boolean hasVerticalScrollBar =  -            boolean hasVerticalScrollBar =
1497  -                comboBox.getItemCount() > comboBox.getMaximumRowCount();  -                comboBox.getItemCount() > comboBox.getMaximumRowCount();
1498  -            if (hasVerticalScrollBar) {  -            if (hasVerticalScrollBar) {
1499  -                // Add the scrollbar width.  -                // Add the scrollbar width.
# Line 1511  Description: remove windows look Line 1506  Description: remove windows look
1506  -                : defaultBounds;  -                : defaultBounds;
1507  -        }  -        }
1508  -  -
1509  -    }      -    }
1510  -      -
1511  -      -
1512  -    // Handling Combo Changes *************************************************  -    // Handling Combo Changes *************************************************
1513  -      -
1514  -    /**  -    /**
1515  -     * Listens to changes in the table cell editor client property  -     * Listens to changes in the table cell editor client property
1516  -     * and updates the default editor - if any - to use the correct  -     * and updates the default editor - if any - to use the correct
# Line 1534  Description: remove windows look Line 1529  Description: remove windows look
1529  -    }  -    }
1530  -  -
1531  -}  -}
1532  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsFieldCaret.java  --- a/src/core/com/jgoodies/looks/windows/WindowsFieldCaret.java
1533  +++ /dev/null  +++ /dev/null
1534  @@ -1,347 +0,0 @@  @@ -1,367 +0,0 @@
1535  -/*  -/*
1536  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
1537  - *  - *
1538  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
1539  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
1540  - *  - *
1541  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
1542  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
1543  - *      - *
1544  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
1545  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
1546  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
1547  - *      - *
1548  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
1549  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
1550  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
1551  - *      - *
1552  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1553  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
1554  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1555  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
1556  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1557  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1558  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
1559  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
1560  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
1561  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
1562  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1563  - */  - */
1564  -  -
1565  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 1581  Description: remove windows look Line 1576  Description: remove windows look
1576  -import javax.swing.plaf.UIResource;  -import javax.swing.plaf.UIResource;
1577  -import javax.swing.text.*;  -import javax.swing.text.*;
1578  -  -
1579    -import com.jgoodies.looks.Options;
1580    -
1581  -/**  -/**
1582  - * WindowsFieldCaret has different scrolling behavior than the DefaultCaret.  - * WindowsFieldCaret has different scrolling behavior than the DefaultCaret.
1583  - * Also, this caret is visible in non-editable fields,  - * Also, this caret is visible in non-editable fields,
1584  - * and the text is selected after a keyboard focus gained event.  - * and the text is selected after a keyboard focus gained event.
1585  - * For the latter see also issue #4337647 in Sun's bug database.  - * For the latter see also issue #4337647 in Sun's bug database.
1586  - *  - *
1587  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
1588  - * @version $Revision: 1.5 $  - * @version $Revision: 1.10 $
1589  - *  - *
1590  - */  - */
1591  -final class WindowsFieldCaret extends DefaultCaret implements UIResource {  -final class WindowsFieldCaret extends DefaultCaret implements UIResource {
1592  -  -
1593  -    private static final LayeredHighlighter.LayerPainter WindowsPainter =  -    private static final LayeredHighlighter.LayerPainter WindowsPainter =
1594  -        new WindowsHighlightPainter(null);  -        new WindowsHighlightPainter(null);
1595  -  -
1596  -  -
# Line 1608  Description: remove windows look Line 1605  Description: remove windows look
1605  -  -
1606  -  -
1607  -    public void focusGained(FocusEvent e) {  -    public void focusGained(FocusEvent e) {
1608  -        if (getComponent().isEnabled()) {  -        final JTextComponent c = getComponent();
1609    -        if (c.isEnabled()) {
1610  -            setVisible(true);  -            setVisible(true);
1611  -            setSelectionVisible(true);  -            setSelectionVisible(true);
1612  -        }  -        }
1613  -  -        if (!c.isEditable()) {
1614  -        final JTextComponent c = getComponent();  -            return;
1615  -        if (c.isEnabled() && isKeyboardFocusEvent) {  -        }
1616    -        if (   c.isEnabled()
1617    -                && isKeyboardFocusEvent
1618    -                && Options.isSelectOnFocusGainActive(c)) {
1619  -            if (c instanceof JFormattedTextField) {  -            if (c instanceof JFormattedTextField) {
1620  -                EventQueue.invokeLater(new Runnable() {  -                EventQueue.invokeLater(new Runnable() {
1621  -                    public void run() {  -                    public void run() {
1622  -                        WindowsFieldCaret.super.setDot(0);  -                        selectAll();
 -                        WindowsFieldCaret.super.moveDot(c.getDocument().getLength());  
1623  -                    }  -                    }
1624  -                });  -                });
1625  -            } else {  -            } else {
1626  -                super.setDot(0);  -                selectAll();
 -                super.moveDot(c.getDocument().getLength());  
1627  -            }  -            }
1628  -        }  -        }
1629  -    }  -    }
1630  -  -
1631  -  -
1632    -    private void selectAll() {
1633    -        final JTextComponent c = getComponent();
1634    -        boolean backward = Boolean.TRUE.equals(c.getClientProperty(Options.INVERT_SELECTION_CLIENT_KEY));
1635    -        if (backward) {
1636    -            setDot(c.getDocument().getLength());
1637    -            moveDot(0);
1638    -        } else {
1639    -            setDot(0);
1640    -            moveDot(c.getDocument().getLength());
1641    -        }
1642    -    }
1643    -
1644    -
1645  -    public void focusLost(FocusEvent e) {  -    public void focusLost(FocusEvent e) {
1646  -        super.focusLost(e);  -        super.focusLost(e);
1647  -        if (!e.isTemporary()) {  -        if (!e.isTemporary()) {
1648  -            isKeyboardFocusEvent = true;  -            isKeyboardFocusEvent = true;
1649    -            if (Boolean.TRUE.equals(getComponent().getClientProperty(Options.SET_CARET_TO_START_ON_FOCUS_LOST_CLIENT_KEY))) {
1650    -                setDot(0);
1651    -            }
1652  -        }  -        }
1653  -    }  -    }
1654  -  -
# Line 1649  Description: remove windows look Line 1664  Description: remove windows look
1664  -  -
1665  -    public void mouseReleased(MouseEvent e) {  -    public void mouseReleased(MouseEvent e) {
1666  -        super.mouseReleased(e);  -        super.mouseReleased(e);
1667  -        // super.mousePressed() does not transfer focus on popup clicks.  -        // super.mousePressed() does not transfer focus on popup clicks.
1668  -        // Windows does.  -        // Windows does.
1669  -        if (e.isPopupTrigger()) {  -        if (e.isPopupTrigger()) {
1670  -            isKeyboardFocusEvent = false;  -            isKeyboardFocusEvent = false;
# Line 1727  Description: remove windows look Line 1742  Description: remove windows look
1742  -            }  -            }
1743  -        }  -        }
1744  -  -
1745  -        private Rectangle r;  -        private final Rectangle r;
1746  -    }  -    }
1747  -      -
1748  -    // Helper Classes *********************************************************  -    // Helper Classes *********************************************************
1749  -      -
1750  -    private static final class WindowsHighlightPainter extends  -    private static final class WindowsHighlightPainter extends
1751  -            DefaultHighlighter.DefaultHighlightPainter {  -            DefaultHighlighter.DefaultHighlightPainter {
1752  -        WindowsHighlightPainter(Color c) {  -        WindowsHighlightPainter(Color c) {
# Line 1884  Description: remove windows look Line 1899  Description: remove windows look
1899  -    }  -    }
1900  -  -
1901  -}  -}
1902  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsFormattedTextFieldUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsFormattedTextFieldUI.java
1903  +++ /dev/null  +++ /dev/null
1904  @@ -1,68 +0,0 @@  @@ -1,68 +0,0 @@
1905  -/*  -/*
1906  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
1907  - *  - *
1908  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
1909  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
1910  - *  - *
1911  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
1912  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
1913  - *      - *
1914  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
1915  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
1916  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
1917  - *      - *
1918  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
1919  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
1920  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
1921  - *      - *
1922  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1923  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
1924  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1925  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
1926  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1927  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1928  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
1929  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
1930  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
1931  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
1932  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1933  - */  - */
1934  -  -
1935  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 1926  Description: remove windows look Line 1941  Description: remove windows look
1941  -  -
1942  -/**  -/**
1943  - * The JGoodies Windows L&amp;F implementation of <code>FormattedTextFieldUI</code>.  - * The JGoodies Windows L&amp;F implementation of <code>FormattedTextFieldUI</code>.
1944  - * It uses a caret that selects all text if the field gains focus  - * It uses a caret that selects all text if the field gains focus
1945  - * after a keyboard focus traversal.  - * after a keyboard focus traversal.
1946  - *  - *
1947  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
1948  - * @version $Revision: 1.2 $  - * @version $Revision: 1.4 $
1949  - */  - */
1950  -public final class WindowsFormattedTextFieldUI extends BasicFormattedTextFieldUI {  -public final class WindowsFormattedTextFieldUI extends BasicFormattedTextFieldUI {
1951  -      -
1952  -    /**  -    /**
1953  -     * Creates a UI for a JFormattedTextField.  -     * Creates a UI for a JFormattedTextField.
1954  -     *  -     *
# Line 1955  Description: remove windows look Line 1970  Description: remove windows look
1970  -    }  -    }
1971  -  -
1972  -}  -}
1973  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsIconFactory.java  --- a/src/core/com/jgoodies/looks/windows/WindowsIconFactory.java
1974  +++ /dev/null  +++ /dev/null
1975  @@ -1,219 +0,0 @@  @@ -1,215 +0,0 @@
1976  -/*  -/*
1977  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
1978  - *  - *
1979  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
1980  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
1981  - *  - *
1982  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
1983  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
1984  - *      - *
1985  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
1986  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
1987  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
1988  - *      - *
1989  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
1990  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
1991  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
1992  - *      - *
1993  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1994  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
1995  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
1996  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
1997  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
1998  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
1999  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
2000  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
2001  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
2002  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2003  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2004  - */  - */
2005  -  -
2006  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 1994  Description: remove windows look Line 2009  Description: remove windows look
2009  -import java.awt.Graphics;  -import java.awt.Graphics;
2010  -import java.io.Serializable;  -import java.io.Serializable;
2011  -  -
2012  -import javax.swing.AbstractButton;  -import javax.swing.*;
 -import javax.swing.ButtonModel;  
 -import javax.swing.Icon;  
 -import javax.swing.JCheckBox;  
 -import javax.swing.UIManager;  
2013  -import javax.swing.plaf.UIResource;  -import javax.swing.plaf.UIResource;
2014  -  -
2015  -/**  -/**
2016  - * Factory class that vends <code>Icon</code>s used in the JGoodies Windows look&amp;feel.  - * Factory class that vends <code>Icon</code>s used in the JGoodies Windows look&amp;feel.
2017  - *  - *
2018  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
2019  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
2020  - */  - */
2021  -final class WindowsIconFactory {  -final class WindowsIconFactory {
2022  -  -
2023  -    private WindowsIconFactory() {  -    private WindowsIconFactory() {
2024  -        // Overrides default constructor; prevents instantiation.  -        // Overrides default constructor; prevents instantiation.
2025  -    }  -    }
2026  -      -
2027  -       // Accessing and Creating Icons *****************************************************  -       // Accessing and Creating Icons *****************************************************
2028  -  -
2029  -    private static Icon checkBoxIcon;  -    private static Icon checkBoxIcon;
# Line 2042  Description: remove windows look Line 2053  Description: remove windows look
2053  -  -
2054  -  -
2055  -       // Helper Classes *******************************************************************  -       // Helper Classes *******************************************************************
2056  -        -
2057  -       // Paints the icon for a check box.  -       // Paints the icon for a check box.
2058  -    private static class CheckBoxIcon implements Icon, Serializable {  -    private static class CheckBoxIcon implements Icon, Serializable {
2059  -        -
2060  -               private static final int SIZE  = 13;  -               private static final int SIZE  = 13;
2061  -                -
2062  -               public void paintIcon(Component c, Graphics g, int x, int y) {  -               public void paintIcon(Component c, Graphics g, int x, int y) {
2063  -                   JCheckBox cb = (JCheckBox) c;  -                   JCheckBox cb = (JCheckBox) c;
2064  -                   ButtonModel model = cb.getModel();  -                   ButtonModel model = cb.getModel();
2065  -        -
2066  -                   // outer bevel  -                   // outer bevel
2067  -                   if (!cb.isBorderPaintedFlat()) {  -                   if (!cb.isBorderPaintedFlat()) {
2068  -                // Outer top/left  -                // Outer top/left
2069  -                g.setColor(UIManager.getColor("CheckBox.shadow"));  -                g.setColor(UIManager.getColor("CheckBox.shadow"));
2070  -                g.drawLine(x, y, x+11, y);  -                g.drawLine(x, y, x+11, y);
2071  -                g.drawLine(x, y+1, x, y+11);  -                g.drawLine(x, y+1, x, y+11);
2072  -                  -
2073  -                // Outer bottom/right  -                // Outer bottom/right
2074  -                g.setColor(UIManager.getColor("CheckBox.highlight"));  -                g.setColor(UIManager.getColor("CheckBox.highlight"));
2075  -                g.drawLine(x+12, y, x+12, y+12);  -                g.drawLine(x+12, y, x+12, y+12);
2076  -                g.drawLine(x, y+12, x+11, y+12);  -                g.drawLine(x, y+12, x+11, y+12);
2077  -                  -
2078  -                // Inner top.left  -                // Inner top.left
2079  -                g.setColor(UIManager.getColor("CheckBox.darkShadow"));  -                g.setColor(UIManager.getColor("CheckBox.darkShadow"));
2080  -                g.drawLine(x+1, y+1, x+10, y+1);  -                g.drawLine(x+1, y+1, x+10, y+1);
2081  -                g.drawLine(x+1, y+2, x+1, y+10);  -                g.drawLine(x+1, y+2, x+1, y+10);
2082  -                  -
2083  -                // Inner bottom/right  -                // Inner bottom/right
2084  -                g.setColor(UIManager.getColor("CheckBox.light"));  -                g.setColor(UIManager.getColor("CheckBox.light"));
2085  -                g.drawLine(x+1, y+11, x+11, y+11);  -                g.drawLine(x+1, y+11, x+11, y+11);
# Line 2077  Description: remove windows look Line 2088  Description: remove windows look
2088  -                               g.setColor(UIManager.getColor("CheckBox.shadow"));  -                               g.setColor(UIManager.getColor("CheckBox.shadow"));
2089  -                               g.drawRect(x+1, y+1, SIZE-3, SIZE-3);  -                               g.drawRect(x+1, y+1, SIZE-3, SIZE-3);
2090  -                   }  -                   }
2091  -                       // inside box  -                       // inside box
2092  -                       g.setColor(UIManager.getColor(  -                       g.setColor(UIManager.getColor(
2093  -                                       (model.isPressed() && model.isArmed()) || !model.isEnabled()  -                                       (model.isPressed() && model.isArmed()) || !model.isEnabled()
2094  -                                               ? "CheckBox.background"  -                                               ? "CheckBox.background"
2095  -                                               : "CheckBox.interiorBackground"));  -                                               : "CheckBox.interiorBackground"));
2096  -                       g.fillRect(x+2, y+2, SIZE-4, SIZE-4);  -                       g.fillRect(x+2, y+2, SIZE-4, SIZE-4);
2097  -        -
2098  -                   g.setColor(UIManager.getColor(model.isEnabled()  -                   g.setColor(UIManager.getColor(model.isEnabled()
2099  -                                                       ? "CheckBox.checkColor"  // Modified by JGoodies  -                                                       ? "CheckBox.checkColor"  // Modified by JGoodies
2100  -                                                       : "CheckBox.shadow"));  -                                                       : "CheckBox.shadow"));
2101  -        -
2102  -                   // paint check  -                   // paint check
2103  -                   if (model.isSelected()) {  -                   if (model.isSelected()) {
2104  -                               g.drawLine(x+9, y+3, x+9, y+3);  -                               g.drawLine(x+9, y+3, x+9, y+3);
# Line 2101  Description: remove windows look Line 2112  Description: remove windows look
2112  -                               g.drawLine(x+3, y+6, x+4, y+6);  -                               g.drawLine(x+3, y+6, x+4, y+6);
2113  -                   }  -                   }
2114  -               }  -               }
2115  -        -
2116  -               public int getIconWidth()  { return SIZE; }  -               public int getIconWidth()  { return SIZE; }
2117  -               public int getIconHeight() { return SIZE; }  -               public int getIconHeight() { return SIZE; }
2118  -    }  -    }
2119  -      -
2120  -  -
2121  -       // Paints the icon for a radio button.  -       // Paints the icon for a radio button.
2122  -       private static class RadioButtonIcon implements Icon, UIResource, Serializable {  -       private static class RadioButtonIcon implements Icon, UIResource, Serializable {
2123  -        -
2124  -               private static final int SIZE  = 13;  -               private static final int SIZE  = 13;
2125  -  -
2126  -               public void paintIcon(Component c, Graphics g, int x, int y) {  -               public void paintIcon(Component c, Graphics g, int x, int y) {
2127  -                   AbstractButton b = (AbstractButton) c;  -                   AbstractButton b = (AbstractButton) c;
2128  -                   ButtonModel model = b.getModel();  -                   ButtonModel model = b.getModel();
2129  -        -
2130  -                   // fill interior  -                   // fill interior
2131  -                   g.setColor(UIManager.getColor(  -                   g.setColor(UIManager.getColor(
2132  -                               (model.isPressed() && model.isArmed()) || !model.isEnabled()  -                               (model.isPressed() && model.isArmed()) || !model.isEnabled()
2133  -                                               ? "RadioButton.background"  -                                               ? "RadioButton.background"
2134  -                                               : "RadioButton.interiorBackground"));  -                                               : "RadioButton.interiorBackground"));
2135  -                   g.fillRect(x+2, y+2, 8, 8);  -                   g.fillRect(x+2, y+2, 8, 8);
2136  -                        -
2137  -                        -
2138  -                       // outter left arc  -                       // outter left arc
2139  -                   g.setColor(UIManager.getColor("RadioButton.shadow"));  -                   g.setColor(UIManager.getColor("RadioButton.shadow"));
2140  -                   g.drawLine(x+4, y+0, x+7, y+0);  -                   g.drawLine(x+4, y+0, x+7, y+0);
# Line 2132  Description: remove windows look Line 2143  Description: remove windows look
2143  -                   g.drawLine(x+1, y+2, x+1, y+3);  -                   g.drawLine(x+1, y+2, x+1, y+3);
2144  -                   g.drawLine(x+0, y+4, x+0, y+7);  -                   g.drawLine(x+0, y+4, x+0, y+7);
2145  -                   g.drawLine(x+1, y+8, x+1, y+9);  -                   g.drawLine(x+1, y+8, x+1, y+9);
2146  -          -
2147  -                   // outter right arc  -                   // outter right arc
2148  -                   g.setColor(UIManager.getColor("RadioButton.highlight"));  -                   g.setColor(UIManager.getColor("RadioButton.highlight"));
2149  -                   g.drawLine(x+2, y+10, x+3, y+10);  -                   g.drawLine(x+2, y+10, x+3, y+10);
# Line 2141  Description: remove windows look Line 2152  Description: remove windows look
2152  -                   g.drawLine(x+10, y+9, x+10, y+8);  -                   g.drawLine(x+10, y+9, x+10, y+8);
2153  -                   g.drawLine(x+11, y+7, x+11, y+4);  -                   g.drawLine(x+11, y+7, x+11, y+4);
2154  -                   g.drawLine(x+10, y+3, x+10, y+2);  -                   g.drawLine(x+10, y+3, x+10, y+2);
2155  -          -
2156  -          -
2157  -                   // inner left arc  -                   // inner left arc
2158  -                   g.setColor(UIManager.getColor("RadioButton.darkShadow"));  -                   g.setColor(UIManager.getColor("RadioButton.darkShadow"));
2159  -                   g.drawLine(x+4, y+1, x+7, y+1);  -                   g.drawLine(x+4, y+1, x+7, y+1);
# Line 2151  Description: remove windows look Line 2162  Description: remove windows look
2162  -                   g.drawLine(x+2, y+3, x+2, y+3);  -                   g.drawLine(x+2, y+3, x+2, y+3);
2163  -                   g.drawLine(x+1, y+4, x+1, y+7);  -                   g.drawLine(x+1, y+4, x+1, y+7);
2164  -                   g.drawLine(x+2, y+8, x+2, y+8);  -                   g.drawLine(x+2, y+8, x+2, y+8);
2165  -        -
2166  -          -
2167  -                   // inner right arc  -                   // inner right arc
2168  -                   g.setColor(UIManager.getColor("RadioButton.light"));  -                   g.setColor(UIManager.getColor("RadioButton.light"));
2169  -                   g.drawLine(x+2,  y+9,  x+3,  y+9);  -                   g.drawLine(x+2,  y+9,  x+3,  y+9);
# Line 2161  Description: remove windows look Line 2172  Description: remove windows look
2172  -                   g.drawLine(x+9,  y+8,  x+9,  y+8);  -                   g.drawLine(x+9,  y+8,  x+9,  y+8);
2173  -                   g.drawLine(x+10, y+7,  x+10, y+4);  -                   g.drawLine(x+10, y+7,  x+10, y+4);
2174  -                   g.drawLine(x+9,  y+3,  x+9,  y+3);  -                   g.drawLine(x+9,  y+3,  x+9,  y+3);
2175  -          -
2176  -          -
2177  -                   // indicate whether selected or not  -                   // indicate whether selected or not
2178  -                   if(model.isSelected()) {  -                   if(model.isSelected()) {
2179  -                               g.setColor(UIManager.getColor("RadioButton.checkColor")); // Modified by JGoodies  -                               g.setColor(UIManager.getColor("RadioButton.checkColor")); // Modified by JGoodies
2180  -                               g.fillRect(x+4, y+5, 4, 2);  -                               g.fillRect(x+4, y+5, 4, 2);
2181  -                               g.fillRect(x+5, y+4, 2, 4);  -                               g.fillRect(x+5, y+4, 2, 4);
2182  -                   }  -                   }
2183  -               }  -               }
2184  -        -
2185  -               public int getIconWidth()  { return SIZE; }  -               public int getIconWidth()  { return SIZE; }
2186  -               public int getIconHeight() { return SIZE; }  -               public int getIconHeight() { return SIZE; }
2187  -                -
2188  -    }  -    }
2189  -        -
2190  -}  -}
2191  \ No newline at end of file  \ No newline at end of file
2192  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsLookAndFeel.java  --- a/src/core/com/jgoodies/looks/windows/WindowsLookAndFeel.java
2193  +++ /dev/null  +++ /dev/null
2194  @@ -1,760 +0,0 @@  @@ -1,759 +0,0 @@
2195  -/*  -/*
2196  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
2197  - *  - *
2198  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
2199  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
2200  - *  - *
2201  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
2202  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
2203  - *      - *
2204  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
2205  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
2206  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
2207  - *      - *
2208  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
2209  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
2210  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
2211  - *      - *
2212  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2213  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
2214  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
2215  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
2216  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
2217  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
2218  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
2219  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
2220  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
2221  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2222  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2223  - */  - */
2224  -  -
2225  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 2218  Description: remove windows look Line 2229  Description: remove windows look
2229  -import java.awt.Insets;  -import java.awt.Insets;
2230  -import java.lang.reflect.Method;  -import java.lang.reflect.Method;
2231  -  -
2232  -import javax.swing.Icon;  -import javax.swing.*;
 -import javax.swing.JComponent;  
 -import javax.swing.UIDefaults;  
 -import javax.swing.UIManager;  
2233  -import javax.swing.border.Border;  -import javax.swing.border.Border;
2234  -import javax.swing.border.EmptyBorder;  -import javax.swing.border.EmptyBorder;
2235  -import javax.swing.plaf.DimensionUIResource;  -import javax.swing.plaf.DimensionUIResource;
# Line 2239  Description: remove windows look Line 2247  Description: remove windows look
2247  - * This look provides several corrections and extensions to Sun's Windows L&F.  - * This look provides several corrections and extensions to Sun's Windows L&F.
2248  - * In addition it tries to provide a unified look for the J2SE 1.4.0x, 1.4.1x,  - * In addition it tries to provide a unified look for the J2SE 1.4.0x, 1.4.1x,
2249  - * 1.4.2, and 1.5 environments.  - * 1.4.2, and 1.5 environments.
2250  - *  - *
2251  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
2252  - * @version $Revision: 1.36 $  - * @version $Revision: 1.39 $
2253  - */  - */
2254  -public final class WindowsLookAndFeel extends com.sun.java.swing.plaf.windows.WindowsLookAndFeel {  -public final class WindowsLookAndFeel extends com.sun.java.swing.plaf.windows.WindowsLookAndFeel {
2255  -  -
2256  -    /**  -    /**
2257  -     * An optional client property key for JMenu and JToolBar  -     * An optional client property key for JMenu and JToolBar
2258  -     * to set a border style - shadows the header style.  -     * to set a border style - shadows the header style.
2259  -     */  -     */
2260  -    public static final String BORDER_STYLE_KEY = "jgoodies.windows.borderStyle";  -    public static final String BORDER_STYLE_KEY = "jgoodies.windows.borderStyle";
 -      
 -      
 -    public String getID() {  
 -        return "JGoodies Windows";  
 -    }  
2261  -  -
2262  -      -
2263    -    /**
2264    -     * Returns the String &quot;JGoodies Windows&quot;.
2265    -     * Note that this L&amp;f's ID (&quot;Windows&quot;) is inherited
2266    -     * from the superclass, because we don't do any fundamental changes.
2267    -     *
2268    -     * @see LookAndFeel#getID()
2269    -     */
2270  -    public String getName() {  -    public String getName() {
2271  -        return "JGoodies Windows";  -        return "JGoodies Windows";
2272  -    }  -    }
2273  -  -
2274  -      -
2275  -    public String getDescription() {  -    public String getDescription() {
2276  -        return "The JGoodies Windows Look and Feel"  -        return "The JGoodies Windows Look and Feel"
2277  -                + " - \u00a9 2001-2007 JGoodies Karsten Lentzsch";  -                + " - \u00a9 2001-2008 JGoodies Karsten Lentzsch";
2278  -    }  -    }
2279  -      -
2280  -      -
2281  -    // Optional Settings ******************************************************  -    // Optional Settings ******************************************************
2282  -      -
2283  -    /**  -    /**
2284  -     * Looks up and retrieves the FontPolicy used by  -     * Looks up and retrieves the FontPolicy used by
2285  -     * the JGoodies Windows Look&amp;Feel.  -     * the JGoodies Windows Look&amp;Feel.
2286  -     * If a FontPolicy has been set for this look, it'll be returned.  -     * If a FontPolicy has been set for this look, it'll be returned.
2287  -     * Otherwise, this method checks if a FontPolicy or FontSet is defined  -     * Otherwise, this method checks if a FontPolicy or FontSet is defined
2288  -     * in the system properties or UIDefaults. If so, it is returned.  -     * in the system properties or UIDefaults. If so, it is returned.
2289  -     * If no FontPolicy has been set for this look, in the system  -     * If no FontPolicy has been set for this look, in the system
2290  -     * properties or UIDefaults, the default Windows font policy  -     * properties or UIDefaults, the default Windows font policy
2291  -     * will be returned.  -     * will be returned.
2292  -     *  -     *
2293  -     * @return the FontPolicy set for this Look&amp;feel - if any,  -     * @return the FontPolicy set for this Look&amp;feel - if any,
2294  -     *     the FontPolicy specified in the system properties or UIDefaults  -     *     the FontPolicy specified in the system properties or UIDefaults
2295  -     *     - if any, or the default Windows font policy.  -     *     - if any, or the default Windows font policy.
2296  -     *  -     *
2297  -     * @see #setFontPolicy  -     * @see #setFontPolicy
2298  -     * @see Options#WINDOWS_FONT_POLICY_KEY  -     * @see Options#WINDOWS_FONT_POLICY_KEY
2299  -     * @see FontPolicies  -     * @see FontPolicies
# Line 2291  Description: remove windows look Line 2301  Description: remove windows look
2301  -     * @see FontPolicies#getDefaultWindowsPolicy()  -     * @see FontPolicies#getDefaultWindowsPolicy()
2302  -     */  -     */
2303  -    public static FontPolicy getFontPolicy() {  -    public static FontPolicy getFontPolicy() {
2304  -        FontPolicy policy =  -        FontPolicy policy =
2305  -            (FontPolicy) UIManager.get(Options.WINDOWS_FONT_POLICY_KEY);  -            (FontPolicy) UIManager.get(Options.WINDOWS_FONT_POLICY_KEY);
2306  -        if (policy != null)  -        if (policy != null)
2307  -            return policy;  -            return policy;
2308  -          -
2309  -        FontPolicy defaultPolicy = FontPolicies.getDefaultWindowsPolicy();  -        FontPolicy defaultPolicy = FontPolicies.getDefaultWindowsPolicy();
2310  -        return FontPolicies.customSettingsPolicy(defaultPolicy);  -        return FontPolicies.customSettingsPolicy(defaultPolicy);
2311  -    }  -    }
2312  -      -
2313  -      -
2314  -    /**  -    /**
2315  -     * Sets the FontPolicy to be used with the JGoodies Windows L&amp;F.  -     * Sets the FontPolicy to be used with the JGoodies Windows L&amp;F.
2316  -     * If the specified policy is <code>null</code>, the default will be reset.  -     * If the specified policy is <code>null</code>, the default will be reset.
2317  -     *  -     *
2318  -     * @param fontPolicy   the FontPolicy to be used with the JGoodies Windows  -     * @param fontPolicy   the FontPolicy to be used with the JGoodies Windows
2319  -     *     L&amp;F, or <code>null</code> to reset to the default  -     *     L&amp;F, or <code>null</code> to reset to the default
2320  -     *      -     *
2321  -     * @see #getFontPolicy()  -     * @see #getFontPolicy()
2322  -     * @see Options#WINDOWS_FONT_POLICY_KEY  -     * @see Options#WINDOWS_FONT_POLICY_KEY
2323  -     */  -     */
2324  -    public static void setFontPolicy(FontPolicy fontPolicy) {  -    public static void setFontPolicy(FontPolicy fontPolicy) {
2325  -        UIManager.put(Options.WINDOWS_FONT_POLICY_KEY, fontPolicy);  -        UIManager.put(Options.WINDOWS_FONT_POLICY_KEY, fontPolicy);
2326  -    }  -    }
2327  -      -
2328  -  -
2329  -    /**  -    /**
2330  -     * Looks up and retrieves the MicroLayoutPolicy used by  -     * Looks up and retrieves the MicroLayoutPolicy used by
2331  -     * the JGoodies Windows Look&amp;Feel.  -     * the JGoodies Windows Look&amp;Feel.
2332  -     * If a MicroLayoutPolicy has been set for this look, it'll be returned.  -     * If a MicroLayoutPolicy has been set for this look, it'll be returned.
2333  -     * Otherwise, the default Windows micro layout policy will be returned.  -     * Otherwise, the default Windows micro layout policy will be returned.
2334  -     *  -     *
2335  -     * @return the MicroLayoutPolicy set for this Look&amp;feel - if any,  -     * @return the MicroLayoutPolicy set for this Look&amp;feel - if any,
2336  -     *     or the default Windows MicroLayoutPolicy.  -     *     or the default Windows MicroLayoutPolicy.
2337  -     *  -     *
2338  -     * @see #setMicroLayoutPolicy  -     * @see #setMicroLayoutPolicy
2339  -     * @see Options#WINDOWS_MICRO_LAYOUT_POLICY_KEY  -     * @see Options#WINDOWS_MICRO_LAYOUT_POLICY_KEY
2340  -     * @see MicroLayoutPolicies  -     * @see MicroLayoutPolicies
2341  -     * @see MicroLayoutPolicies#getDefaultWindowsPolicy()  -     * @see MicroLayoutPolicies#getDefaultWindowsPolicy()
2342  -     */  -     */
2343  -    public static MicroLayoutPolicy getMicroLayoutPolicy() {  -    public static MicroLayoutPolicy getMicroLayoutPolicy() {
2344  -        MicroLayoutPolicy policy =  -        MicroLayoutPolicy policy =
2345  -            (MicroLayoutPolicy) UIManager.get(Options.WINDOWS_MICRO_LAYOUT_POLICY_KEY);  -            (MicroLayoutPolicy) UIManager.get(Options.WINDOWS_MICRO_LAYOUT_POLICY_KEY);
2346  -        return policy != null  -        return policy != null
2347  -            ? policy  -            ? policy
2348  -            : MicroLayoutPolicies.getDefaultWindowsPolicy();  -            : MicroLayoutPolicies.getDefaultWindowsPolicy();
2349  -    }  -    }
2350  -      -
2351  -      -
2352  -    /**  -    /**
2353  -     * Sets the MicroLayoutPolicy to be used with the JGoodies Windows L&amp;F.  -     * Sets the MicroLayoutPolicy to be used with the JGoodies Windows L&amp;F.
2354  -     * If the specified policy is <code>null</code>, the default will be reset.  -     * If the specified policy is <code>null</code>, the default will be reset.
2355  -     *  -     *
2356  -     * @param microLayoutPolicy   the MicroLayoutPolicy to be used with  -     * @param microLayoutPolicy   the MicroLayoutPolicy to be used with
2357  -     *     the JGoodies Windows L&amp;F, or <code>null</code> to reset  -     *     the JGoodies Windows L&amp;F, or <code>null</code> to reset
2358  -     *     to the default  -     *     to the default
2359  -     *      -     *
2360  -     * @see #getMicroLayoutPolicy()  -     * @see #getMicroLayoutPolicy()
2361  -     * @see Options#WINDOWS_MICRO_LAYOUT_POLICY_KEY  -     * @see Options#WINDOWS_MICRO_LAYOUT_POLICY_KEY
2362  -     */  -     */
2363  -    public static void setMicroLayoutPolicy(MicroLayout microLayoutPolicy) {  -    public static void setMicroLayoutPolicy(MicroLayout microLayoutPolicy) {
2364  -        UIManager.put(Options.WINDOWS_MICRO_LAYOUT_POLICY_KEY, microLayoutPolicy);  -        UIManager.put(Options.WINDOWS_MICRO_LAYOUT_POLICY_KEY, microLayoutPolicy);
2365  -    }  -    }
2366  -      -
2367  -  -
2368  -    // Overriding Superclass Behavior ***************************************  -    // Overriding Superclass Behavior ***************************************
2369  -  -
2370  -    /**  -    /**
2371  -     * Invoked during <code>UIManager#setLookAndFeel</code>. In addition  -     * Invoked during <code>UIManager#setLookAndFeel</code>. In addition
2372  -     * to the superclass behavior, we install the ShadowPopupFactory.  -     * to the superclass behavior, we install the ShadowPopupFactory.
2373  -     *  -     *
2374  -     * @see #uninitialize  -     * @see #uninitialize
2375  -     */  -     */
2376  -    public void initialize() {  -    public void initialize() {
2377  -        super.initialize();  -        super.initialize();
2378  -        ShadowPopupFactory.install();  -        ShadowPopupFactory.install();
2379  -    }  -    }
2380  -      -
2381  -      -
2382  -    /**  -    /**
2383  -     * Invoked during <code>UIManager#setLookAndFeel</code>. In addition  -     * Invoked during <code>UIManager#setLookAndFeel</code>. In addition
2384  -     * to the superclass behavior, we uninstall the ShadowPopupFactory.  -     * to the superclass behavior, we uninstall the ShadowPopupFactory.
2385  -     *  -     *
2386  -     * @see #initialize  -     * @see #initialize
2387  -     */  -     */
2388  -    public void uninitialize() {  -    public void uninitialize() {
# Line 2384  Description: remove windows look Line 2394  Description: remove windows look
2394  -    /**  -    /**
2395  -     * Returns an icon with a disabled appearance. This method is used  -     * Returns an icon with a disabled appearance. This method is used
2396  -     * to generate a disabled icon when one has not been specified.<p>  -     * to generate a disabled icon when one has not been specified.<p>
2397  -     *  -     *
2398  -     * This method will be used only on JDK 5.0 and later.  -     * This method will be used only on JDK 5.0 and later.
2399  -     *  -     *
2400  -     * @param component the component that will display the icon, may be null.  -     * @param component the component that will display the icon, may be null.
# Line 2410  Description: remove windows look Line 2420  Description: remove windows look
2420  -  -
2421  -        // Overwrite some of the uiDefaults.  -        // Overwrite some of the uiDefaults.
2422  -        Object[] uiDefaults = {  -        Object[] uiDefaults = {
2423  -            // Modified size  -            // Modified size
2424  -            "ComboBoxUI",            windowsPrefix + "ComboBoxUI",  -            "ComboBoxUI",            windowsPrefix + "ComboBoxUI",
2425  -  -
2426  -            // Modified preferred height: can be even or odd  -            // Modified preferred height: can be even or odd
2427  -            "ButtonUI",              windowsPrefix + "ButtonUI",  -            "ButtonUI",              windowsPrefix + "ButtonUI",
2428  -  -
2429  -            // Can installs an optional etched border  -            // Can installs an optional etched border
2430  -                       "ScrollPaneUI",          windowsPrefix + "ScrollPaneUI",  -                       "ScrollPaneUI",          windowsPrefix + "ScrollPaneUI",
2431  -  -
2432  -            // Optional style and optional special borders  -            // Optional style and optional special borders
2433  -            "MenuBarUI",             windowsPrefix + "MenuBarUI",  -            "MenuBarUI",             windowsPrefix + "MenuBarUI",
2434  -  -
2435  -            // Provides an option for a no margin border                -            // Provides an option for a no margin border
2436  -            "PopupMenuUI",           windowsPrefix + "PopupMenuUI",  -            "PopupMenuUI",           windowsPrefix + "PopupMenuUI",
2437  -            -
2438  -            // Honors the screen resolution and uses a minimum button width              -            // Honors the screen resolution and uses a minimum button width
2439  -            "OptionPaneUI",          windowsPrefix + "OptionPaneUI",  -            "OptionPaneUI",          windowsPrefix + "OptionPaneUI",
2440  -  -
2441  -            // 1.4.1 has ugly one touch triangles  -            // 1.4.1 has ugly one touch triangles
2442  -            "SplitPaneUI",           windowsPrefix + "SplitPaneUI",  -            "SplitPaneUI",           windowsPrefix + "SplitPaneUI",
2443  -  -
2444  -            // Work in progress: Can have a flat presentation  -            // Work in progress: Can have a flat presentation
2445  -            "TabbedPaneUI",          windowsPrefix + "TabbedPaneUI",  -            "TabbedPaneUI",          windowsPrefix + "TabbedPaneUI",
2446  -              -
2447  -            // Selects text after focus gained via keyboard  -            // Selects text after focus gained via keyboard
2448  -            "TextFieldUI",           windowsPrefix + "TextFieldUI",  -            "TextFieldUI",           windowsPrefix + "TextFieldUI",
2449  -            "FormattedTextFieldUI",  windowsPrefix + "FormattedTextFieldUI",  -            "FormattedTextFieldUI",  windowsPrefix + "FormattedTextFieldUI",
2450  -  -
2451  -            // Selects text after focus gained via keyboard  -            // Selects text after focus gained via keyboard
2452  -            // Renders a dot, not the star ("*") character on Java 1.4 and 5                        -            // Renders a dot, not the star ("*") character on Java 1.4 and 5
2453  -            "PasswordFieldUI",       windowsPrefix + "PasswordFieldUI",  -            "PasswordFieldUI",       windowsPrefix + "PasswordFieldUI",
2454    -
2455  -  -
 -              
2456  -            // Updates the disabled and inactive background  -            // Updates the disabled and inactive background
2457  -            "TextAreaUI",            windowsPrefix + "TextAreaUI",  -            "TextAreaUI",            windowsPrefix + "TextAreaUI",
2458  -  -
2459  -            // Corrected position of the tree button icon  -            // Corrected position of the tree button icon
2460  -            "TreeUI",                windowsPrefix + "TreeUI",  -            "TreeUI",                windowsPrefix + "TreeUI",
2461  -              -
2462  -            // Just to use shared UI delegate  -            // Just to use shared UI delegate
2463  -            "SeparatorUI",           windowsPrefix + "SeparatorUI"};  -            "SeparatorUI",           windowsPrefix + "SeparatorUI"};
2464  -  -
2465  -        if (LookUtils.IS_JAVA_1_4_2_OR_LATER) {  -        if (LookUtils.IS_JAVA_1_4_2_OR_LATER) {
2466  -            // Modified Border  -            // Modified Border
2467  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2468  -            "SpinnerUI",             windowsPrefix + "SpinnerUI");  -            "SpinnerUI",             windowsPrefix + "SpinnerUI");
2469  -        }  -        }
2470  -  -
2471  -        // Aligned menu items  -        // Aligned menu items
2472  -        if (  !LookUtils.IS_JAVA_6_OR_LATER  -        if (  !LookUtils.IS_JAVA_6_OR_LATER
2473  -           || !LookUtils.IS_OS_WINDOWS_VISTA  -           || !LookUtils.IS_OS_WINDOWS_VISTA
2474  -           || !LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {  -           || !LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {
2475  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2476  -            "MenuItemUI",            windowsPrefix + "MenuItemUI");  -            "MenuItemUI",            windowsPrefix + "MenuItemUI");
2477  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2478  -            "CheckBoxMenuItemUI",    commonPrefix + "CheckBoxMenuItemUI");  -            "CheckBoxMenuItemUI",    commonPrefix + "CheckBoxMenuItemUI");
2479  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2480  -            "RadioButtonMenuItemUI", commonPrefix + "RadioButtonMenuItemUI");  -            "RadioButtonMenuItemUI", commonPrefix + "RadioButtonMenuItemUI");
2481  -            // Has padding above and below the separator lines                -            // Has padding above and below the separator lines
2482  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2483  -            "PopupMenuSeparatorUI",  commonPrefix + "PopupMenuSeparatorUI");  -            "PopupMenuSeparatorUI",  commonPrefix + "PopupMenuSeparatorUI");
2484  -        }  -        }
2485  -          -
2486  -        if (LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {  -        if (LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {
2487  -            // Aligned menu items  -            // Aligned menu items
2488  -            if (!LookUtils.IS_JAVA_6_OR_LATER || !LookUtils.IS_OS_WINDOWS_VISTA) {  -            if (!LookUtils.IS_JAVA_6_OR_LATER || !LookUtils.IS_OS_WINDOWS_VISTA) {
2489  -                uiDefaults = append(uiDefaults,  -                uiDefaults = append(uiDefaults,
2490  -                "MenuUI",             windowsPrefix + "XPMenuUI");  -                "MenuUI",             windowsPrefix + "XPMenuUI");
2491  -            }  -            }
2492  -              -
2493  -            // Optional style and optional special borders;  -            // Optional style and optional special borders;
2494  -            // rollover borders for compound buttons  -            // rollover borders for compound buttons
2495  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2496  -                "ToolBarUI",          windowsPrefix + "XPToolBarUI");  -                "ToolBarUI",          windowsPrefix + "XPToolBarUI");
2497  -              -
2498  -            // Honors XP table header style for custom user renderers.  -            // Honors XP table header style for custom user renderers.
2499  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2500  -                "TableHeaderUI",      windowsPrefix + "XPTableHeaderUI");              -                "TableHeaderUI",      windowsPrefix + "XPTableHeaderUI");
2501  -        } else {  -        } else {
2502  -            // Aligned menu items  -            // Aligned menu items
2503  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2504  -                "MenuUI",             commonPrefix + "MenuUI");  -                "MenuUI",             commonPrefix + "MenuUI");
2505  -              -
2506  -            // Optional style and optional special borders;  -            // Optional style and optional special borders;
2507  -            // rollover borders corrected  -            // rollover borders corrected
2508  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2509  -                "ToolBarUI",          windowsPrefix + "ToolBarUI");  -                "ToolBarUI",          windowsPrefix + "ToolBarUI");
2510  -  -
2511  -            // Black arrows  -            // Black arrows
2512  -            uiDefaults = append(uiDefaults,  -            uiDefaults = append(uiDefaults,
2513  -                "ScrollBarUI",        windowsPrefix + "ScrollBarUI");  -                "ScrollBarUI",        windowsPrefix + "ScrollBarUI");
2514  -  -
2515  -            if (!LookUtils.IS_JAVA_1_4_2_OR_LATER) {  -            if (!LookUtils.IS_JAVA_1_4_2_OR_LATER) {
2516  -                // Uses unmodified size specified by "ToolBar.separatorSize"  -                // Uses unmodified size specified by "ToolBar.separatorSize"
2517  -                uiDefaults = append(uiDefaults,  -                uiDefaults = append(uiDefaults,
2518  -                        "ToolBarSeparatorUI", windowsPrefix + "ToolBarSeparatorUI");  -                        "ToolBarSeparatorUI", windowsPrefix + "ToolBarSeparatorUI");
2519  -            }  -            }
2520  -        }  -        }
# Line 2516  Description: remove windows look Line 2526  Description: remove windows look
2526  -     */  -     */
2527  -    protected void initComponentDefaults(UIDefaults table) {  -    protected void initComponentDefaults(UIDefaults table) {
2528  -        super.initComponentDefaults(table);  -        super.initComponentDefaults(table);
2529  -          -
2530  -        final boolean isXP = LookUtils.IS_LAF_WINDOWS_XP_ENABLED;  -        final boolean isXP = LookUtils.IS_LAF_WINDOWS_XP_ENABLED;
2531  -        final boolean isClassic = !isXP;  -        final boolean isClassic = !isXP;
2532  -        final boolean isVista = LookUtils.IS_OS_WINDOWS_VISTA;  -        final boolean isVista = LookUtils.IS_OS_WINDOWS_VISTA;
# Line 2529  Description: remove windows look Line 2539  Description: remove windows look
2539  -        if (isXP && LookUtils.IS_JAVA_1_4) {  -        if (isXP && LookUtils.IS_JAVA_1_4) {
2540  -            initComponentDefaultsXP14(table);  -            initComponentDefaultsXP14(table);
2541  -        }  -        }
2542  -          -
2543  -        MicroLayout microLayout = getMicroLayoutPolicy().getMicroLayout("Windows", table);  -        MicroLayout microLayout = getMicroLayoutPolicy().getMicroLayout("Windows", table);
2544  -        if (!isVista || !LookUtils.IS_JAVA_6_OR_LATER || !LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {  -        if (!isVista || !LookUtils.IS_JAVA_6_OR_LATER || !LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {
2545  -            initMenuItemDefaults(table, microLayout);  -            initMenuItemDefaults(table, microLayout);
# Line 2544  Description: remove windows look Line 2554  Description: remove windows look
2554  -        Object buttonBorder = new SimpleProxyLazyValue(  -        Object buttonBorder = new SimpleProxyLazyValue(
2555  -                "com.jgoodies.looks.windows.WindowsLookAndFeel",  -                "com.jgoodies.looks.windows.WindowsLookAndFeel",
2556  -                "getButtonBorder");  -                "getButtonBorder");
2557  -          -
2558  -        Object menuBorder = isXP  -        Object menuBorder = isXP
2559  -            ? WindowsBorders.getXPMenuBorder()  -            ? WindowsBorders.getXPMenuBorder()
2560  -            : WindowsBorders.getMenuBorder();  -            : WindowsBorders.getMenuBorder();
# Line 2568  Description: remove windows look Line 2578  Description: remove windows look
2578  -        Object textInsets = microLayout.getTextInsets();  -        Object textInsets = microLayout.getTextInsets();
2579  -        Object wrappedTextInsets = microLayout.getWrappedTextInsets();  -        Object wrappedTextInsets = microLayout.getWrappedTextInsets();
2580  -        Insets comboEditorInsets = microLayout.getComboBoxEditorInsets();  -        Insets comboEditorInsets = microLayout.getComboBoxEditorInsets();
2581  -          -
2582  -        int comboBorderSize  = microLayout.getComboBorderSize();  -        int comboBorderSize  = microLayout.getComboBorderSize();
2583  -        int comboPopupBorderSize = microLayout.getComboPopupBorderSize();  -        int comboPopupBorderSize = microLayout.getComboPopupBorderSize();
2584  -        int comboRendererGap = comboEditorInsets.left + comboBorderSize - comboPopupBorderSize;  -        int comboRendererGap = comboEditorInsets.left + comboBorderSize - comboPopupBorderSize;
2585  -        Object comboRendererBorder = new EmptyBorder(1, comboRendererGap, 1, comboRendererGap);  -        Object comboRendererBorder = new EmptyBorder(1, comboRendererGap, 1, comboRendererGap);
2586  -        Object comboTableEditorInsets = new Insets(0, 0, 0, 0);  -        Object comboTableEditorInsets = new Insets(0, 0, 0, 0);
2587  -          -
2588  -        Object popupMenuSeparatorMargin = microLayout.getPopupMenuSeparatorMargin();  -        Object popupMenuSeparatorMargin = microLayout.getPopupMenuSeparatorMargin();
2589  -  -
2590  -        //     Should be active.  -        //     Should be active.
# Line 2585  Description: remove windows look Line 2595  Description: remove windows look
2595  -        Color controlColor = table.getColor("control");  -        Color controlColor = table.getColor("control");
2596  -        Object disabledTextBackground = table.getColor("TextField.disabledBackground");  -        Object disabledTextBackground = table.getColor("TextField.disabledBackground");
2597  -        Object inactiveTextBackground = table.getColor("TextField.inactiveBackground");  -        Object inactiveTextBackground = table.getColor("TextField.inactiveBackground");
2598  -          -
2599  -        Object comboBoxDisabledBackground = (isVista && isXP)  -        Object comboBoxDisabledBackground = (isVista && isXP)
2600  -            ? table.getColor("ComboBox.background")  -            ? table.getColor("ComboBox.background")
2601  -            : disabledTextBackground;  -            : disabledTextBackground;
2602  -  -
2603  -        Object menuBarBackground = isXP  -        Object menuBarBackground = isXP
2604  -                ? table.get("control")  -                ? table.get("control")
2605  -                               : table.get("menu");  -                               : table.get("menu");
2606  -        Object menuSelectionBackground = isXP  -        Object menuSelectionBackground = isXP
2607  -                ? table.get("MenuItem.selectionBackground")  -                ? table.get("MenuItem.selectionBackground")
# Line 2599  Description: remove windows look Line 2609  Description: remove windows look
2609  -        Object menuSelectionForeground = isXP  -        Object menuSelectionForeground = isXP
2610  -                ? table.get("MenuItem.selectionForeground")  -                ? table.get("MenuItem.selectionForeground")
2611  -                : table.get("Menu.foreground");  -                : table.get("Menu.foreground");
2612  -          -
2613  -        Character  passwordEchoChar     = new Character(isXP ? '\u25CF' : '*');  -        Character  passwordEchoChar     = new Character(isXP ? '\u25CF' : '*');
2614  -          -
2615  -        Object[] defaults = {  -        Object[] defaults = {
2616  -            "Button.border",              buttonBorder,  -            "Button.border",              buttonBorder,
2617  -                       "Button.margin",              buttonMargin, // Sun's 14px margin is too wide  -                       "Button.margin",              buttonMargin, // Sun's 14px margin is too wide
2618  -  -
2619  -            // 1.4.2 uses a 2 pixel non-standard border that leads to bad  -            // 1.4.2 uses a 2 pixel non-standard border that leads to bad
2620  -            // alignment in the typical case that the border is not painted  -            // alignment in the typical case that the border is not painted
2621  -            "CheckBox.border",            marginBorder,  -            "CheckBox.border",            marginBorder,
2622  -            "CheckBox.margin",            checkBoxMargin,  -            "CheckBox.margin",            checkBoxMargin,
2623  -              -
2624  -            "ComboBox.disabledBackground", comboBoxDisabledBackground,  -            "ComboBox.disabledBackground", comboBoxDisabledBackground,
2625  -            "ComboBox.editorBorder",      marginBorder,  -            "ComboBox.editorBorder",      marginBorder,
2626  -            "ComboBox.editorColumns",     new Integer(5),  -            "ComboBox.editorColumns",     new Integer(5),
2627  -            "ComboBox.editorInsets",      comboEditorInsets,   // Added by JGoodies  -            "ComboBox.editorInsets",      comboEditorInsets,   // Added by JGoodies
2628  -            "ComboBox.tableEditorInsets", comboTableEditorInsets,              -            "ComboBox.tableEditorInsets", comboTableEditorInsets,
2629  -            "ComboBox.rendererBorder",    comboRendererBorder, // Added by JGoodies  -            "ComboBox.rendererBorder",    comboRendererBorder, // Added by JGoodies
2630  -              -
2631  -            "EditorPane.margin",                 wrappedTextInsets,  -            "EditorPane.margin",                 wrappedTextInsets,
2632  -              -
2633  -            // Begin 1.3 und 1.4.0  -            // Begin 1.3 und 1.4.0
2634  -            "Menu.border",                menuBorder, // Fixed in 1.4.1  -            "Menu.border",                menuBorder, // Fixed in 1.4.1
2635  -            "Menu.borderPainted",         Boolean.TRUE,  -            "Menu.borderPainted",         Boolean.TRUE,
2636  -                       "Menu.background",            menuBarBackground,  -                       "Menu.background",            menuBarBackground,
2637  -                       "Menu.selectionForeground",   menuSelectionForeground,  -                       "Menu.selectionForeground",   menuSelectionForeground,
2638  -                       "Menu.selectionBackground",   menuSelectionBackground,  -                       "Menu.selectionBackground",   menuSelectionBackground,
2639  -            // End 1.3 und 1.4.0  -            // End 1.3 und 1.4.0
2640  -  -
2641  -            "MenuBar.background",         menuBarBackground,  -            "MenuBar.background",         menuBarBackground,
2642  -                       "MenuBar.border",             menuBarSeparatorBorder, // 1.4.1 Separator wrong  -                       "MenuBar.border",             menuBarSeparatorBorder, // 1.4.1 Separator wrong
2643  -            "MenuBar.emptyBorder",        menuBarEmptyBorder, // Added by JGoodies  -            "MenuBar.emptyBorder",        menuBarEmptyBorder, // Added by JGoodies
2644  -            "MenuBar.separatorBorder",    menuBarSeparatorBorder, // Added by JGoodies  -            "MenuBar.separatorBorder",    menuBarSeparatorBorder, // Added by JGoodies
2645  -            "MenuBar.etchedBorder",       menuBarEtchedBorder, // Added by JGoodies  -            "MenuBar.etchedBorder",       menuBarEtchedBorder, // Added by JGoodies
2646  -            "MenuBar.headerBorder",       menuBarHeaderBorder, // Added by JGoodies  -            "MenuBar.headerBorder",       menuBarHeaderBorder, // Added by JGoodies
2647  -  -
2648  -            "FormattedTextField.disabledBackground", disabledTextBackground, // for readonly  -            "FormattedTextField.disabledBackground", disabledTextBackground, // for readonly
2649  -            "FormattedTextField.inactiveBackground", inactiveTextBackground, // for readonly  -            "FormattedTextField.inactiveBackground", inactiveTextBackground, // for readonly
2650  -            "FormattedTextField.margin",  textInsets, // Poor in 1.6  -            "FormattedTextField.margin",  textInsets, // Poor in 1.6
2651  -              -
2652  -            "PasswordField.margin",       textInsets, // Poor in 1.6  -            "PasswordField.margin",       textInsets, // Poor in 1.6
2653  -            "PasswordField.echoChar",     passwordEchoChar,  -            "PasswordField.echoChar",     passwordEchoChar,
2654  -              -
2655  -            "PopupMenu.border",           WindowsBorders.getPopupMenuBorder(),  -            "PopupMenu.border",           WindowsBorders.getPopupMenuBorder(),
2656  -            "PopupMenu.noMarginBorder",   WindowsBorders.getNoMarginPopupMenuBorder(),  -            "PopupMenu.noMarginBorder",   WindowsBorders.getNoMarginPopupMenuBorder(),
2657  -            "PopupMenuSeparator.margin",  popupMenuSeparatorMargin,  -            "PopupMenuSeparator.margin",  popupMenuSeparatorMargin,
2658  -  -
2659  -            "ScrollPane.etchedBorder",    etchedBorder, // Added by JGoodies  -            "ScrollPane.etchedBorder",    etchedBorder, // Added by JGoodies
2660  -              -
2661  -            "Spinner.defaultEditorInsets", textInsets, // Added by JGoodies  -            "Spinner.defaultEditorInsets", textInsets, // Added by JGoodies
2662  -              -
2663  -            // 1.4.1 uses a 2 pixel non-standard border, that leads to bad  -            // 1.4.1 uses a 2 pixel non-standard border, that leads to bad
2664  -            // alignment in the typical case that the border is not painted  -            // alignment in the typical case that the border is not painted
2665  -            "RadioButton.border",         marginBorder,  -            "RadioButton.border",         marginBorder,
2666  -            "RadioButton.margin",         checkBoxMargin,  -            "RadioButton.margin",         checkBoxMargin,
2667  -              -
2668  -            "Table.gridColor",            controlColor, // 1.4.1 Bug; active  -            "Table.gridColor",            controlColor, // 1.4.1 Bug; active
2669  -            "TextArea.margin",            wrappedTextInsets, // 1.4.1 Bug  -            "TextArea.margin",            wrappedTextInsets, // 1.4.1 Bug
2670  -            "TextArea.disabledBackground", disabledTextBackground,  -            "TextArea.disabledBackground", disabledTextBackground,
# Line 2666  Description: remove windows look Line 2676  Description: remove windows look
2676  -            "ToolBar.separatorBorder",    toolBarSeparatorBorder, // Added by JGoodies  -            "ToolBar.separatorBorder",    toolBarSeparatorBorder, // Added by JGoodies
2677  -            "ToolBar.etchedBorder",       toolBarEtchedBorder, // Added by JGoodies  -            "ToolBar.etchedBorder",       toolBarEtchedBorder, // Added by JGoodies
2678  -            "ToolBar.headerBorder",       toolBarHeaderBorder, // Added by JGoodies  -            "ToolBar.headerBorder",       toolBarHeaderBorder, // Added by JGoodies
2679  -            "ToolBar.separatorSize",      toolBarSeparatorSize,  -            "ToolBar.separatorSize",      toolBarSeparatorSize,
2680  -                       "ToolBar.margin",             new InsetsUIResource(0, 10, 0, 0),  -                       "ToolBar.margin",             new InsetsUIResource(0, 10, 0, 0),
2681  -  -
2682  -            "Tree.selectionBorderColor",  controlColor, // 1.4.1 Bug; active  -            "Tree.selectionBorderColor",  controlColor, // 1.4.1 Bug; active
2683  -            "Tree.rowHeight",             rowHeight, // 1.4.1 Bug  -            "Tree.rowHeight",             rowHeight, // 1.4.1 Bug
# Line 2678  Description: remove windows look Line 2688  Description: remove windows look
2688  -            "OptionPane.errorIcon",       isXP ? makeIcon(getClass(), "icons/xp/Error.png")  -            "OptionPane.errorIcon",       isXP ? makeIcon(getClass(), "icons/xp/Error.png")
2689  -                                               : makeIcon(superclass, "icons/Error.gif"),  -                                               : makeIcon(superclass, "icons/Error.gif"),
2690  -            "OptionPane.informationIcon", isXP ? makeIcon(getClass(), "icons/xp/Inform.png")  -            "OptionPane.informationIcon", isXP ? makeIcon(getClass(), "icons/xp/Inform.png")
2691  -                                               : makeIcon(superclass, "icons/Inform.gif"),  -                                               : makeIcon(superclass, "icons/Inform.gif"),
2692  -            "OptionPane.warningIcon",     isXP ? makeIcon(getClass(), "icons/xp/Warn.png")  -            "OptionPane.warningIcon",     isXP ? makeIcon(getClass(), "icons/xp/Warn.png")
2693  -                                               : makeIcon(superclass, "icons/Warn.gif"),  -                                               : makeIcon(superclass, "icons/Warn.gif"),
2694  -            "OptionPane.questionIcon",    isXP ? makeIcon(getClass(), "icons/xp/Inform.png")  -            "OptionPane.questionIcon",    isXP ? makeIcon(getClass(), "icons/xp/Inform.png")
2695  -                                               : makeIcon(superclass, "icons/Question.gif")  -                                               : makeIcon(superclass, "icons/Question.gif")
2696  -            });  -            });
# Line 2721  Description: remove windows look Line 2731  Description: remove windows look
2731  -  -
2732  -        Object[] defaults = {  -        Object[] defaults = {
2733  -            "CheckBox.checkColor",    table.get("controlText"), // kind-of black  -            "CheckBox.checkColor",    table.get("controlText"), // kind-of black
2734  -            "CheckBox.icon",          checkBoxIcon,  -            "CheckBox.icon",          checkBoxIcon,
2735  -                       "RadioButton.checkColor", table.get("controlText"), // kind-of black  -                       "RadioButton.checkColor", table.get("controlText"), // kind-of black
2736  -            "RadioButton.icon",       radioButtonIcon,  -            "RadioButton.icon",       radioButtonIcon,
2737  -            "Table.scrollPaneBorder", winInsetBorder, // 1.4.1 Bug  -            "Table.scrollPaneBorder", winInsetBorder, // 1.4.1 Bug
2738  -  -
2739  -        };  -        };
# Line 2748  Description: remove windows look Line 2758  Description: remove windows look
2758  -        FontSet fontSet = fontChoicePolicy.getFontSet("Windows", table);  -        FontSet fontSet = fontChoicePolicy.getFontSet("Windows", table);
2759  -        initFontDefaults(table, fontSet);  -        initFontDefaults(table, fontSet);
2760  -    }  -    }
2761  -      -
2762  -      -
2763  -    private void initMenuItemDefaults(UIDefaults table, MicroLayout microLayout) {  -    private void initMenuItemDefaults(UIDefaults table, MicroLayout microLayout) {
2764  -        Object menuMargin     = microLayout.getMenuMargin();  -        Object menuMargin     = microLayout.getMenuMargin();
2765  -        Object menuItemMargin = microLayout.getMenuItemMargin();  -        Object menuItemMargin = microLayout.getMenuItemMargin();
# Line 2758  Description: remove windows look Line 2768  Description: remove windows look
2768  -  -
2769  -        "Menu.margin",                menuMargin, // 1.4.1 Bug  -        "Menu.margin",                menuMargin, // 1.4.1 Bug
2770  -  -
2771  -        "MenuItem.borderPainted",     Boolean.TRUE,  -        "MenuItem.borderPainted",     Boolean.TRUE,
2772  -        "MenuItem.checkIcon",         menuItemCheckIcon, // Aligns menu items  -        "MenuItem.checkIcon",         menuItemCheckIcon, // Aligns menu items
2773  -        "MenuItem.margin",            menuItemMargin, // 1.4.1 Bug  -        "MenuItem.margin",            menuItemMargin, // 1.4.1 Bug
2774  -        "CheckBoxMenuItem.margin",    menuItemMargin, // 1.4.1 Bug  -        "CheckBoxMenuItem.margin",    menuItemMargin, // 1.4.1 Bug
# Line 2767  Description: remove windows look Line 2777  Description: remove windows look
2777  -        table.putDefaults(defaults);  -        table.putDefaults(defaults);
2778  -    }  -    }
2779  -  -
2780  -      -
2781  -    /**  -    /**
2782  -        * Sets Fonts in the given FontSet as defaults for all known  -        * Sets Fonts in the given FontSet as defaults for all known
2783  -     * component types in the given UIDefaults table.  -     * component types in the given UIDefaults table.
2784  -     *  -     *
2785  -     * @param table       the UIDefaults table used to set fonts  -     * @param table       the UIDefaults table used to set fonts
2786  -     * @param fontSet     describes the set of Fonts to be installed  -     * @param fontSet     describes the set of Fonts to be installed
2787  -        */  -        */
# Line 2782  Description: remove windows look Line 2792  Description: remove windows look
2792  -        Font toolTipFont = fontSet.getSmallFont();  -        Font toolTipFont = fontSet.getSmallFont();
2793  -        Font titleFont   = fontSet.getTitleFont();  -        Font titleFont   = fontSet.getTitleFont();
2794  -        Font windowFont  = fontSet.getWindowTitleFont();  -        Font windowFont  = fontSet.getWindowTitleFont();
2795  -          -
2796  -               Object[] defaults = {  -               Object[] defaults = {
2797  -                               "Button.font",                                                  controlFont,  -                               "Button.font",                                                  controlFont,
2798  -                               "CheckBox.font",                                                controlFont,  -                               "CheckBox.font",                                                controlFont,
# Line 2801  Description: remove windows look Line 2811  Description: remove windows look
2811  -                               "TabbedPane.font",                                              controlFont,  -                               "TabbedPane.font",                                              controlFont,
2812  -                               "Table.font",                                                   controlFont,  -                               "Table.font",                                                   controlFont,
2813  -                               "TableHeader.font",                                             controlFont,  -                               "TableHeader.font",                                             controlFont,
2814  -                "TextArea.font",                        controlFont,    -                "TextArea.font",                        controlFont,
2815  -                               "TextField.font",                                               controlFont,  -                               "TextField.font",                                               controlFont,
2816  -                               "TextPane.font",                                                controlFont,  -                               "TextPane.font",                                                controlFont,
2817  -                               "ToolBar.font",                                                 controlFont,  -                               "ToolBar.font",                                                 controlFont,
# Line 2830  Description: remove windows look Line 2840  Description: remove windows look
2840  -        table.putDefaults(defaults);  -        table.putDefaults(defaults);
2841  -       }  -       }
2842  -  -
2843  -      -
2844  -    // Getters for Proxy Access (Referred classes can stay package visible) ***  -    // Getters for Proxy Access (Referred classes can stay package visible) ***
2845  -  -
2846  -    public static Border getButtonBorder() {  -    public static Border getButtonBorder() {
# Line 2844  Description: remove windows look Line 2854  Description: remove windows look
2854  -    public static Icon getRadioButtonIcon() {  -    public static Icon getRadioButtonIcon() {
2855  -        return WindowsIconFactory.getRadioButtonIcon();  -        return WindowsIconFactory.getRadioButtonIcon();
2856  -    }  -    }
2857  -      -
2858  -      -
2859  -    // Helper Code ************************************************************  -    // Helper Code ************************************************************
2860  -      -
2861  -    /**  -    /**
2862  -     * Appends the key and value to the given source array and returns  -     * Appends the key and value to the given source array and returns
2863  -     * a copy that has the two new elements at its end.  -     * a copy that has the two new elements at its end.
2864  -     *  -     *
2865  -     * @return an array with the key and value appended  -     * @return an array with the key and value appended
2866  -     */  -     */
2867  -    private static Object[] append(Object[] source, String key, Object value) {  -    private static Object[] append(Object[] source, String key, Object value) {
# Line 2867  Description: remove windows look Line 2877  Description: remove windows look
2877  -    /**  -    /**
2878  -     * Appends the key and value to the given source array and returns  -     * Appends the key and value to the given source array and returns
2879  -     * a copy that has the two new elements at its end.  -     * a copy that has the two new elements at its end.
2880  -     *  -     *
2881  -     * @return an array with the key and value appended  -     * @return an array with the key and value appended
2882  -     */  -     */
2883  -    private static Object[] append(Object[] source, Object[] keysAndValues) {  -    private static Object[] append(Object[] source, Object[] keysAndValues) {
# Line 2880  Description: remove windows look Line 2890  Description: remove windows look
2890  -        return destination;  -        return destination;
2891  -    }  -    }
2892  -  -
2893  -    // Helper Class ***********************************************************          -    // Helper Class ***********************************************************
2894  -  -
2895  -    /**  -    /**
2896  -     * This class provides an implementation of <code>LazyValue</code> that  -     * This class provides an implementation of <code>LazyValue</code> that
# Line 2900  Description: remove windows look Line 2910  Description: remove windows look
2910  -        /**  -        /**
2911  -         * Creates a <code>LazyValue</code> which will construct an instance  -         * Creates a <code>LazyValue</code> which will construct an instance
2912  -         * when asked.  -         * when asked.
2913  -         *  -         *
2914  -         * @param c    a <code>String</code> specifying the classname of the class  -         * @param c    a <code>String</code> specifying the classname of the class
2915  -         *                     containing a static method to be called for instance creation  -         *                     containing a static method to be called for instance creation
2916  -         * @param m    a <code>String</code> specifying the static  -         * @param m    a <code>String</code> specifying the static
2917  -         *             method to be called on class c  -         *             method to be called on class c
2918  -         */  -         */
2919  -        public SimpleProxyLazyValue(String c, String m) {  -        public SimpleProxyLazyValue(String c, String m) {
# Line 2942  Description: remove windows look Line 2952  Description: remove windows look
2952  -  -
2953  -}  -}
2954  \ No newline at end of file  \ No newline at end of file
2955  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsMenuBarUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsMenuBarUI.java
2956  +++ /dev/null  +++ /dev/null
2957  @@ -1,126 +0,0 @@  @@ -1,126 +0,0 @@
2958  -/*  -/*
2959  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
2960  - *  - *
2961  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
2962  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
2963  - *  - *
2964  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
2965  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
2966  - *      - *
2967  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
2968  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
2969  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
2970  - *      - *
2971  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
2972  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
2973  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
2974  - *      - *
2975  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
2976  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
2977  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
2978  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
2979  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
2980  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
2981  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
2982  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
2983  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
2984  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
2985  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2986  - */  - */
2987  -  -
2988  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 2990  Description: remove windows look Line 3000  Description: remove windows look
3000  -  -
3001  -/**  -/**
3002  - * The JGoodies Windows look and feel implemenation of <code>MenuBarUI</code>.<p>  - * The JGoodies Windows look and feel implemenation of <code>MenuBarUI</code>.<p>
3003  - *  - *
3004  - * Can handle optional <code>Border</code> types as specified by the  - * Can handle optional <code>Border</code> types as specified by the
3005  - * <code>BorderStyle</code> or <code>HeaderStyle</code> client properties.  - * <code>BorderStyle</code> or <code>HeaderStyle</code> client properties.
3006  - *  - *
3007  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
3008  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
3009  - */  - */
3010  -public final class WindowsMenuBarUI extends com.sun.java.swing.plaf.windows.WindowsMenuBarUI {  -public final class WindowsMenuBarUI extends com.sun.java.swing.plaf.windows.WindowsMenuBarUI {
3011  -        -
3012  -       private PropertyChangeListener listener;  -       private PropertyChangeListener listener;
3013  -        -
3014  -        -
3015  -       public static ComponentUI createUI(JComponent b) {  -       public static ComponentUI createUI(JComponent b) {
3016  -               return new WindowsMenuBarUI();  -               return new WindowsMenuBarUI();
3017  -       }  -       }
3018  -        -
3019  -        -
3020  -       // Handling Special Borders *********************************************************  -       // Handling Special Borders *********************************************************
3021  -        -
3022  -       protected void installDefaults() {  -       protected void installDefaults() {
3023  -               super.installDefaults();  -               super.installDefaults();
3024  -               installSpecialBorder();  -               installSpecialBorder();
3025  -       }  -       }
3026  -        -
3027  -        -
3028  -       protected void installListeners() {  -       protected void installListeners() {
3029  -               super.installListeners();  -               super.installListeners();
3030  -               listener = createBorderStyleListener();  -               listener = createBorderStyleListener();
3031  -               menuBar.addPropertyChangeListener(listener);  -               menuBar.addPropertyChangeListener(listener);
3032  -       }  -       }
3033  -        -
3034  -        -
3035  -       protected void uninstallListeners() {  -       protected void uninstallListeners() {
3036  -               menuBar.removePropertyChangeListener(listener);  -               menuBar.removePropertyChangeListener(listener);
3037  -               super.uninstallListeners();  -               super.uninstallListeners();
3038  -       }  -       }
3039  -        -
3040  -        -
3041  -       private PropertyChangeListener createBorderStyleListener() {  -       private PropertyChangeListener createBorderStyleListener() {
3042  -               return new PropertyChangeListener() {  -               return new PropertyChangeListener() {
3043  -                        -
3044  -                       public void propertyChange(PropertyChangeEvent e) {  -                       public void propertyChange(PropertyChangeEvent e) {
3045  -                               String prop = e.getPropertyName();  -                               String prop = e.getPropertyName();
3046  -                               if (prop.equals(Options.HEADER_STYLE_KEY) ||  -                               if (prop.equals(Options.HEADER_STYLE_KEY) ||
3047  -                                   prop.equals(WindowsLookAndFeel.BORDER_STYLE_KEY)) {  -                                   prop.equals(WindowsLookAndFeel.BORDER_STYLE_KEY)) {
3048  -                                  WindowsMenuBarUI.this.installSpecialBorder();  -                                  WindowsMenuBarUI.this.installSpecialBorder();
3049  -                               }  -                               }
3050  -                       }  -                       }
3051  -                        -
3052  -               };  -               };
3053  -       }  -       }
3054  -        -
3055  -        -
3056  -       /**  -       /**
3057  -        * Installs a special border, if either a look-dependent  -        * Installs a special border, if either a look-dependent
3058  -        * <code>BorderStyle</code> or a look-independent  -        * <code>BorderStyle</code> or a look-independent
3059  -        * <code>HeaderStyle</code> has been specified.  -        * <code>HeaderStyle</code> has been specified.
3060  -        * A look specific BorderStyle shadows  -        * A look specific BorderStyle shadows
3061  -        * a HeaderStyle.<p>  -        * a HeaderStyle.<p>
3062  -        *  -        *
3063  -        * Specifying a HeaderStyle is recommend.  -        * Specifying a HeaderStyle is recommend.
3064  -        */      -        */
3065  -       private void installSpecialBorder() {  -       private void installSpecialBorder() {
3066  -               String suffix;  -               String suffix;
3067  -               BorderStyle borderStyle = BorderStyle.from(menuBar,  -               BorderStyle borderStyle = BorderStyle.from(menuBar,
3068  -                                                                                               WindowsLookAndFeel.BORDER_STYLE_KEY);  -                                                                                               WindowsLookAndFeel.BORDER_STYLE_KEY);
3069  -               if (borderStyle == BorderStyle.EMPTY)  -               if (borderStyle == BorderStyle.EMPTY)
3070  -                       suffix = "emptyBorder";  -                       suffix = "emptyBorder";
# Line 3066  Description: remove windows look Line 3076  Description: remove windows look
3076  -                       suffix = "headerBorder";  -                       suffix = "headerBorder";
3077  -               else  -               else
3078  -                       return;  -                       return;
3079  -                        -
3080  -               LookAndFeel.installBorder(menuBar, "MenuBar." + suffix);  -               LookAndFeel.installBorder(menuBar, "MenuBar." + suffix);
3081  -       }  -       }
3082  -  -
3083  -}  -}
3084  \ No newline at end of file  \ No newline at end of file
3085  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsMenuItemRenderer.java  --- a/src/core/com/jgoodies/looks/windows/WindowsMenuItemRenderer.java
3086  +++ /dev/null  +++ /dev/null
3087  @@ -1,77 +0,0 @@  @@ -1,77 +0,0 @@
3088  -/*  -/*
3089  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3090  - *  - *
3091  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3092  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3093  - *  - *
3094  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3095  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3096  - *      - *
3097  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3098  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3099  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3100  - *      - *
3101  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3102  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3103  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3104  - *      - *
3105  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3106  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3107  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3108  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3109  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3110  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3111  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3112  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3113  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3114  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3115  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3116  - */  - */
3117  -  -
3118  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3120  Description: remove windows look Line 3130  Description: remove windows look
3130  - * Renders and lays out Windows menu items.  - * Renders and lays out Windows menu items.
3131  - * It overrides superclass behavior for the mnemonic check  - * It overrides superclass behavior for the mnemonic check
3132  - * and the text shadow feature.  - * and the text shadow feature.
3133  - *  - *
3134  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
3135  - * @version $Revision: 1.2 $  - * @version $Revision: 1.4 $
3136  - */  - */
3137  -final class WindowsMenuItemRenderer extends MenuItemRenderer {  -final class WindowsMenuItemRenderer extends MenuItemRenderer {
3138  -  -
# Line 3138  Description: remove windows look Line 3148  Description: remove windows look
3148  -        super(menuItem, iconBorderEnabled, acceleratorFont, selectionForeground, disabledForeground,  -        super(menuItem, iconBorderEnabled, acceleratorFont, selectionForeground, disabledForeground,
3149  -                acceleratorForeground, acceleratorSelectionForeground);  -                acceleratorForeground, acceleratorSelectionForeground);
3150  -       }  -       }
3151  -        -
3152  -        -
3153  -    protected boolean isMnemonicHidden() {  -    protected boolean isMnemonicHidden() {
3154  -        return WindowsLookAndFeel.isMnemonicHidden();  -        return WindowsLookAndFeel.isMnemonicHidden();
3155  -    }  -    }
3156  -      -
3157  -      -
3158  -    protected boolean disabledTextHasShadow() {  -    protected boolean disabledTextHasShadow() {
3159  -        return (!LookUtils.IS_LAF_WINDOWS_XP_ENABLED)  -        return (!LookUtils.IS_LAF_WINDOWS_XP_ENABLED)
3160  -            || (UIManager.getColor("MenuItem.disabledForeground") == null);  -            || (UIManager.getColor("MenuItem.disabledForeground") == null);
3161  -    }  -    }
3162  -      -
3163  -      -
3164  -}  -}
3165  \ No newline at end of file  \ No newline at end of file
3166  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsMenuItemUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsMenuItemUI.java
3167  +++ /dev/null  +++ /dev/null
3168  @@ -1,80 +0,0 @@  @@ -1,80 +0,0 @@
3169  -/*  -/*
3170  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3171  - *  - *
3172  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3173  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3174  - *  - *
3175  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3176  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3177  - *      - *
3178  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3179  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3180  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3181  - *      - *
3182  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3183  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3184  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3185  - *      - *
3186  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3187  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3188  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3189  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3190  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3191  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3192  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3193  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3194  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3195  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3196  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3197  - */  - */
3198  -  -
3199  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3200  Description: remove windows look Line 3210  Description: remove windows look
3210  -  -
3211  -/**  -/**
3212  - * The JGoodies Windows look&amp;feel implementation of <code>MenuItemUI</code>.<p>  - * The JGoodies Windows look&amp;feel implementation of <code>MenuItemUI</code>.<p>
3213  - *  - *
3214  - * It differs from the superclass in that it uses a Windows specific  - * It differs from the superclass in that it uses a Windows specific
3215  - * menu item renderer that checks if mnemonics shall be shown or hidden  - * menu item renderer that checks if mnemonics shall be shown or hidden
3216  - * and may paint disabled text with a shadow.  - * and may paint disabled text with a shadow.
3217  - *  - *
3218  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
3219  - * @version $Revision: 1.2 $  - * @version $Revision: 1.4 $
3220  - */  - */
3221  -public final class WindowsMenuItemUI extends ExtBasicMenuItemUI {  -public final class WindowsMenuItemUI extends ExtBasicMenuItemUI {
3222  -  -
# Line 3215  Description: remove windows look Line 3225  Description: remove windows look
3225  -        return new WindowsMenuItemUI();  -        return new WindowsMenuItemUI();
3226  -    }  -    }
3227  -  -
3228  -      -
3229  -    protected MenuItemRenderer createRenderer(  -    protected MenuItemRenderer createRenderer(
3230  -            JMenuItem menuItem,  -            JMenuItem menuItem,
3231  -            boolean iconBorderEnabled,  -            boolean iconBorderEnabled,
3232  -            Font    acceleratorFont,  -            Font    acceleratorFont,
3233  -            Color   selectionForeground,  -            Color   selectionForeground,
# Line 3237  Description: remove windows look Line 3247  Description: remove windows look
3247  -  -
3248  -}  -}
3249  \ No newline at end of file  \ No newline at end of file
3250  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsOptionPaneUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsOptionPaneUI.java
3251  +++ /dev/null  +++ /dev/null
3252  @@ -1,68 +0,0 @@  @@ -1,68 +0,0 @@
3253  -/*  -/*
3254  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3255  - *  - *
3256  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3257  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3258  - *  - *
3259  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3260  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3261  - *      - *
3262  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3263  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3264  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3265  - *      - *
3266  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3267  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3268  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3269  - *      - *
3270  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3271  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3272  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3273  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3274  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3275  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3276  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3277  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3278  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3279  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3280  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3281  - */  - */
3282  -  -
3283  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3283  Description: remove windows look Line 3293  Description: remove windows look
3293  -import com.jgoodies.looks.common.ExtButtonAreaLayout;  -import com.jgoodies.looks.common.ExtButtonAreaLayout;
3294  -  -
3295  -/**  -/**
3296  - * The JGoodies Windows Look&amp;Feel implementation of  - * The JGoodies Windows Look&amp;Feel implementation of
3297  - * <code>OptionPaneUI</code>. Honors the screen resolution and uses a  - * <code>OptionPaneUI</code>. Honors the screen resolution and uses a
3298  - * minimum button with that complies better with the Windows UI style guide.  - * minimum button with that complies better with the Windows UI style guide.
3299  - *  - *
3300  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
3301  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
3302  - */  - */
3303  -public final class WindowsOptionPaneUI extends BasicOptionPaneUI {  -public final class WindowsOptionPaneUI extends BasicOptionPaneUI {
3304  -  -
# Line 3309  Description: remove windows look Line 3319  Description: remove windows look
3319  -  -
3320  -}  -}
3321  \ No newline at end of file  \ No newline at end of file
3322  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsPasswordFieldUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsPasswordFieldUI.java
3323  +++ /dev/null  +++ /dev/null
3324  @@ -1,102 +0,0 @@  @@ -1,102 +0,0 @@
3325  -/*  -/*
3326  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3327  - *  - *
3328  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3329  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3330  - *  - *
3331  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3332  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3333  - *      - *
3334  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3335  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3336  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3337  - *      - *
3338  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3339  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3340  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3341  - *      - *
3342  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3343  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3344  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3345  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3346  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3347  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3348  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3349  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3350  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3351  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3352  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3353  - */  - */
3354  -  -
3355  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3357  Description: remove windows look Line 3367  Description: remove windows look
3367  -  -
3368  -/**  -/**
3369  - * The JGoodies Windows Look&amp;Feel implementation of a password field UI  - * The JGoodies Windows Look&amp;Feel implementation of a password field UI
3370  - * delegate. It differs from its superclass in that it utilizes a password  - * delegate. It differs from its superclass in that it utilizes a password
3371  - * view that renders a customizable echo char, not a star (&quot;*&quot;).  - * view that renders a customizable echo char, not a star (&quot;*&quot;).
3372  - *  - *
3373  - * Used for Java 1.4 and Java 5.  - * Used for Java 1.4 and Java 5.
3374  - *  - *
3375  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
3376  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
3377  - */  - */
3378  -public final class WindowsPasswordFieldUI extends com.sun.java.swing.plaf.windows.WindowsPasswordFieldUI {  -public final class WindowsPasswordFieldUI extends com.sun.java.swing.plaf.windows.WindowsPasswordFieldUI {
3379  -  -
3380  -    /**  -    /**
3381  -        * Creates a UI for a {@link JPasswordField}.  -        * Creates a UI for a {@link JPasswordField}.
3382  -        *  -        *
3383  -        * @param c the password field component  -        * @param c the password field component
3384  -        * @return the UI  -        * @return the UI
3385  -        */  -        */
# Line 3379  Description: remove windows look Line 3389  Description: remove windows look
3389  -  -
3390  -    /*  -    /*
3391  -     * We'd like to just set the dot as echo character.  -     * We'd like to just set the dot as echo character.
3392  -     * But the JPasswordField (in Java 1.4 and Java 5)  -     * But the JPasswordField (in Java 1.4 and Java 5)
3393  -     * installs the UI in a superclass and then sets the echo character.  -     * installs the UI in a superclass and then sets the echo character.
3394  -     * The latter would override our call to #setEchoChar.  -     * The latter would override our call to #setEchoChar.
3395  -     */  -     */
3396  -//    protected void installDefaults() {  -//    protected void installDefaults() {
# Line 3388  Description: remove windows look Line 3398  Description: remove windows look
3398  -//        JPasswordField field = (JPasswordField) getComponent();  -//        JPasswordField field = (JPasswordField) getComponent();
3399  -//        field.setEchoChar('\u25CF');  -//        field.setEchoChar('\u25CF');
3400  -//    }  -//    }
3401  -      -
3402  -      -
3403  -    /**  -    /**
3404  -        * Creates and returns a view (an <code>ExtPasswordView</code>) for an element.  -        * Creates and returns a view (an <code>ExtPasswordView</code>) for an element.
3405  -        *  -        *
3406  -        * @param elem the element  -        * @param elem the element
3407  -        * @return the view  -        * @return the view
3408  -        */  -        */
# Line 3401  Description: remove windows look Line 3411  Description: remove windows look
3411  -            ? new ExtPasswordView(elem)  -            ? new ExtPasswordView(elem)
3412  -            : super.create(elem);  -            : super.create(elem);
3413  -    }  -    }
3414  -      -
3415  -      -
3416  -    /**  -    /**
3417  -     * Creates the caret for a field.  -     * Creates the caret for a field.
3418  -     *  -     *
# Line 3412  Description: remove windows look Line 3422  Description: remove windows look
3422  -        return new WindowsFieldCaret();  -        return new WindowsFieldCaret();
3423  -    }  -    }
3424  -  -
3425  -      -
3426  -}  -}
3427  \ No newline at end of file  \ No newline at end of file
3428  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsPopupMenuUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsPopupMenuUI.java
3429  +++ /dev/null  +++ /dev/null
3430  @@ -1,110 +0,0 @@  @@ -1,110 +0,0 @@
3431  -/*  -/*
3432  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3433  - *  - *
3434  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3435  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3436  - *  - *
3437  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3438  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3439  - *      - *
3440  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3441  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3442  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3443  - *      - *
3444  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3445  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3446  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3447  - *      - *
3448  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3449  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3450  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3451  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3452  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3453  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3454  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3455  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3456  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3457  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3458  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3459  - */  - */
3460  -  -
3461  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3464  Description: remove windows look Line 3474  Description: remove windows look
3474  -  -
3475  -/**  -/**
3476  - * The JGoodies Windows look&amp;feel implementation of <code>PopMenuUI</code>.  - * The JGoodies Windows look&amp;feel implementation of <code>PopMenuUI</code>.
3477  - * It differs from the superclass in that it provides an option to get a  - * It differs from the superclass in that it provides an option to get a
3478  - * narrow border. You can set a client property  - * narrow border. You can set a client property
3479  - * {@link Options#NO_MARGIN_KEY} to indicate that this popup menu  - * {@link Options#NO_MARGIN_KEY} to indicate that this popup menu
3480  - * has a border without margin. That is useful in the special case  - * has a border without margin. That is useful in the special case
3481  - * where the popup contains only a single component, for example  - * where the popup contains only a single component, for example
3482  - * a JScrollPane.  - * a JScrollPane.
3483  - *  - *
3484  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
3485  - * @version $Revision: 1.4 $  - * @version $Revision: 1.6 $
3486  - *  - *
3487  - * @see        com.jgoodies.looks.Options#NO_MARGIN_KEY  - * @see        com.jgoodies.looks.Options#NO_MARGIN_KEY
3488  - */  - */
3489  -public final class WindowsPopupMenuUI extends com.sun.java.swing.plaf.windows.WindowsPopupMenuUI {  -public final class WindowsPopupMenuUI extends com.sun.java.swing.plaf.windows.WindowsPopupMenuUI {
3490  -  -
3491  -    private PropertyChangeListener borderListener;  -    private PropertyChangeListener borderListener;
3492  -      -
3493  -       public static ComponentUI createUI(JComponent b) {  -       public static ComponentUI createUI(JComponent b) {
3494  -               return new WindowsPopupMenuUI();  -               return new WindowsPopupMenuUI();
3495  -       }  -       }
3496  -        -
3497  -      -
3498  -    public void installDefaults() {  -    public void installDefaults() {
3499  -        super.installDefaults();  -        super.installDefaults();
3500  -        installBorder();  -        installBorder();
# Line 3504  Description: remove windows look Line 3514  Description: remove windows look
3514  -        popupMenu.removePropertyChangeListener(Options.NO_MARGIN_KEY, borderListener);  -        popupMenu.removePropertyChangeListener(Options.NO_MARGIN_KEY, borderListener);
3515  -        super.uninstallListeners();  -        super.uninstallListeners();
3516  -    }  -    }
3517  -      -
3518  -    // Narrow Border **********************************************************  -    // Narrow Border **********************************************************
3519  -      -
3520  -    private final class BorderStyleChangeHandler implements PropertyChangeListener {  -    private final class BorderStyleChangeHandler implements PropertyChangeListener {
3521  -  -
3522  -        public void propertyChange(PropertyChangeEvent e) {  -        public void propertyChange(PropertyChangeEvent e) {
# Line 3516  Description: remove windows look Line 3526  Description: remove windows look
3526  -    }  -    }
3527  -  -
3528  -    /**  -    /**
3529  -     * Installs a border without margin, iff the client property  -     * Installs a border without margin, iff the client property
3530  -     * <code>Options.NO_MARGIN_KEY</code> is set to <code>Boolean.TRUE</code>.  -     * <code>Options.NO_MARGIN_KEY</code> is set to <code>Boolean.TRUE</code>.
3531  -     */  -     */
3532  -    private void installBorder() {  -    private void installBorder() {
3533  -        boolean useNarrowBorder = Boolean.TRUE.equals(  -        boolean useNarrowBorder = Boolean.TRUE.equals(
# Line 3525  Description: remove windows look Line 3535  Description: remove windows look
3535  -        String suffix = useNarrowBorder ? "noMarginBorder" : "border";  -        String suffix = useNarrowBorder ? "noMarginBorder" : "border";
3536  -        LookAndFeel.installBorder(popupMenu, "PopupMenu." + suffix);  -        LookAndFeel.installBorder(popupMenu, "PopupMenu." + suffix);
3537  -    }  -    }
3538  -      -
3539  -  -
3540  -}  -}
3541  \ No newline at end of file  \ No newline at end of file
3542  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsScrollBarUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsScrollBarUI.java
3543  +++ /dev/null  +++ /dev/null
3544  @@ -1,63 +0,0 @@  @@ -1,63 +0,0 @@
3545  -/*  -/*
3546  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3547  - *  - *
3548  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3549  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3550  - *  - *
3551  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3552  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3553  - *      - *
3554  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3555  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3556  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3557  - *      - *
3558  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3559  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3560  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3561  - *      - *
3562  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3563  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3564  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3565  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3566  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3567  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3568  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3569  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3570  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3571  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3572  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3573  - */  - */
3574  -  -
3575  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3572  Description: remove windows look Line 3582  Description: remove windows look
3582  - * The JGoodies Windows L&amp;F implementation of* <code>ScrollBarUI</code>.  - * The JGoodies Windows L&amp;F implementation of* <code>ScrollBarUI</code>.
3583  - * It differs from Sun's Windows Look in that it paints black button triangles  - * It differs from Sun's Windows Look in that it paints black button triangles
3584  - * and that it honors the <code>ScrollBar.width</code> property to determine  - * and that it honors the <code>ScrollBar.width</code> property to determine
3585  - * the preferred size.  - * the preferred size.
3586  - *  - *
3587  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
3588  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
3589  - */  - */
3590  -public final class WindowsScrollBarUI extends com.sun.java.swing.plaf.windows.WindowsScrollBarUI {  -public final class WindowsScrollBarUI extends com.sun.java.swing.plaf.windows.WindowsScrollBarUI {
3591  -        -
3592  -       public static ComponentUI createUI(JComponent b) {  -       public static ComponentUI createUI(JComponent b) {
3593  -               return new WindowsScrollBarUI();  -               return new WindowsScrollBarUI();
3594  -       }  -       }
# Line 3587  Description: remove windows look Line 3597  Description: remove windows look
3597  -       protected JButton createDecreaseButton(int orientation) {  -       protected JButton createDecreaseButton(int orientation) {
3598  -               return new WindowsArrowButton(orientation);  -               return new WindowsArrowButton(orientation);
3599  -       }  -       }
3600  -        -
3601  -        -
3602  -       protected JButton createIncreaseButton(int orientation) {  -       protected JButton createIncreaseButton(int orientation) {
3603  -               return createDecreaseButton(orientation);  -               return createDecreaseButton(orientation);
3604  -       }  -       }
3605  -        -
3606  -        -
3607  -}  -}
3608  \ No newline at end of file  \ No newline at end of file
3609  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsScrollPaneUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsScrollPaneUI.java
3610  +++ /dev/null  +++ /dev/null
3611  @@ -1,99 +0,0 @@  @@ -1,99 +0,0 @@
3612  -/*  -/*
3613  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3614  - *  - *
3615  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3616  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3617  - *  - *
3618  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3619  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3620  - *      - *
3621  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3622  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3623  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3624  - *      - *
3625  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3626  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3627  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3628  - *      - *
3629  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3630  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3631  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3632  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3633  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3634  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3635  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3636  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3637  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3638  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3639  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3640  - */  - */
3641  -  -
3642  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3643  Description: remove windows look Line 3653  Description: remove windows look
3653  -  -
3654  -/**  -/**
3655  - * The JGoodies Windows L&amp;F implementation of <code>ScrollPaneUI</code>.  - * The JGoodies Windows L&amp;F implementation of <code>ScrollPaneUI</code>.
3656  - * Installs an etched border if the client property  - * Installs an etched border if the client property
3657  - * <code>Options.IS_ETCHED_KEY</code> is set.  - * <code>Options.IS_ETCHED_KEY</code> is set.
3658  - *  - *
3659  - * @author  Karsten Lentzsch  - * @author  Karsten Lentzsch
3660  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
3661  - *  - *
3662  - * @see com.jgoodies.looks.Options#IS_ETCHED_KEY  - * @see com.jgoodies.looks.Options#IS_ETCHED_KEY
3663  - */  - */
3664  -public final class WindowsScrollPaneUI extends com.sun.java.swing.plaf.windows.WindowsScrollPaneUI {  -public final class WindowsScrollPaneUI extends com.sun.java.swing.plaf.windows.WindowsScrollPaneUI {
# Line 3667  Description: remove windows look Line 3677  Description: remove windows look
3677  -    protected void installEtchedBorder(JScrollPane scrollPane) {  -    protected void installEtchedBorder(JScrollPane scrollPane) {
3678  -        Object value = scrollPane.getClientProperty(Options.IS_ETCHED_KEY);  -        Object value = scrollPane.getClientProperty(Options.IS_ETCHED_KEY);
3679  -        boolean hasEtchedBorder = Boolean.TRUE.equals(value);  -        boolean hasEtchedBorder = Boolean.TRUE.equals(value);
3680  -        LookAndFeel.installBorder(scrollPane,  -        LookAndFeel.installBorder(scrollPane,
3681  -                hasEtchedBorder  -                hasEtchedBorder
3682  -                    ? "ScrollPane.etchedBorder"  -                    ? "ScrollPane.etchedBorder"
3683  -                    : "ScrollPane.border");  -                    : "ScrollPane.border");
3684  -    }  -    }
# Line 3699  Description: remove windows look Line 3709  Description: remove windows look
3709  -  -
3710  -}  -}
3711  \ No newline at end of file  \ No newline at end of file
3712  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsSeparatorUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsSeparatorUI.java
3713  +++ /dev/null  +++ /dev/null
3714  @@ -1,57 +0,0 @@  @@ -1,57 +0,0 @@
3715  -/*  -/*
3716  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3717  - *  - *
3718  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3719  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3720  - *  - *
3721  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3722  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3723  - *      - *
3724  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3725  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3726  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3727  - *      - *
3728  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3729  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3730  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3731  - *      - *
3732  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3733  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3734  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3735  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3736  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3737  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3738  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3739  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3740  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3741  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3742  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3743  - */  - */
3744  -  -
3745  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3742  Description: remove windows look Line 3752  Description: remove windows look
3752  -/**  -/**
3753  - * The JGoodies Windows L&amp;F implementation of <code>SeparatorUI</code>.  - * The JGoodies Windows L&amp;F implementation of <code>SeparatorUI</code>.
3754  - * It differs from its superclass in that it uses a shared UI delegate.  - * It differs from its superclass in that it uses a shared UI delegate.
3755  - *  - *
3756  - * @author Andrej Golovnin  - * @author Andrej Golovnin
3757  - * @version $Revision: 1.3 $  - * @version $Revision: 1.5 $
3758  - */  - */
3759  -public final class WindowsSeparatorUI extends BasicSeparatorUI {  -public final class WindowsSeparatorUI extends BasicSeparatorUI {
3760  -  -
# Line 3759  Description: remove windows look Line 3769  Description: remove windows look
3769  -    }  -    }
3770  -  -
3771  -}  -}
3772  --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsSpinnerUI.java  --- a/src/core/com/jgoodies/looks/windows/WindowsSpinnerUI.java
3773  +++ /dev/null  +++ /dev/null
3774  @@ -1,209 +0,0 @@  @@ -1,209 +0,0 @@
3775  -/*  -/*
3776  - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.  - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
3777  - *  - *
3778  - * Redistribution and use in source and binary forms, with or without  - * Redistribution and use in source and binary forms, with or without
3779  - * modification, are permitted provided that the following conditions are met:  - * modification, are permitted provided that the following conditions are met:
3780  - *  - *
3781  - *  o Redistributions of source code must retain the above copyright notice,  - *  o Redistributions of source code must retain the above copyright notice,
3782  - *    this list of conditions and the following disclaimer.  - *    this list of conditions and the following disclaimer.
3783  - *      - *
3784  - *  o Redistributions in binary form must reproduce the above copyright notice,  - *  o Redistributions in binary form must reproduce the above copyright notice,
3785  - *    this list of conditions and the following disclaimer in the documentation  - *    this list of conditions and the following disclaimer in the documentation
3786  - *    and/or other materials provided with the distribution.  - *    and/or other materials provided with the distribution.
3787  - *      - *
3788  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
3789  - *    its contributors may be used to endorse or promote products derived  - *    its contributors may be used to endorse or promote products derived
3790  - *    from this software without specific prior written permission.  - *    from this software without specific prior written permission.
3791  - *      - *
3792  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
3793  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
3794  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
3795  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
3796  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
3797  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
3798  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
3799  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
3800  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
3801  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
3802  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3803  - */  - */
3804  -  -
3805  -package com.jgoodies.looks.windows;  -package com.jgoodies.looks.windows;
# Line 3810  Description: remove windows look Line 3820  Description: remove windows look
3820  - * The JGoodies Windows L&amp;F implementation of <code>SpinnerUI</code>.  - * The JGoodies Windows L&amp;F implementation of <code>SpinnerUI</code>.
3821  - * Configures the default editor to adjust font baselines and component  - * Configures the default editor to adjust font baselines and component
3822  - * bounds, by setting an empty border with the default text insets.  - * bounds, by setting an empty border with the default text insets.
3823  - *  - *
3824  - * @author Karsten Lentzsch  - * @author Karsten Lentzsch
3825  - * @version $Revision: 1.4 $  - * @version $Revision: 1.6 $
3826  - */  - */
3827  -public final class WindowsSpinnerUI extends com.sun.java.swing.plaf.windows.WindowsSpinnerUI {  -public final class WindowsSpinnerUI extends com.sun.java.swing.plaf.windows.WindowsSpinnerUI {
3828  -  -
# Line 3824  Description: remove windows look Line 3834  Description: remove windows look
3834  -    /**  -    /**
3835  -     * The mouse/action listeners that are added to the spinner's arrow  -     * The mouse/action listeners that are added to the spinner's arrow
3836  -     * buttons. These listeners are shared by all spinner arrow buttons.  -     * buttons. These listeners are shared by all spinner arrow buttons.
3837  -     *  -     *
3838  -     * @see #createNextButton  -     * @see #createNextButton
3839  -     * @see #createPreviousButton  -     * @see #createPreviousButton
3840  -     */  -     */
3841  -    private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER =  -    private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER =
3842  -        new ExtBasicArrowButtonHandler("increment", true);  -        new ExtBasicArrowButtonHandler("increment", true);
3843  -    private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER =  -    private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER =
3844  -        new ExtBasicArrowButtonHandler("decrement", false);  -        new ExtBasicArrowButtonHandler("decrement", false);
3845  -  -
3846  -  -
# Line 3841  Description: remove windows look Line 3851  Description: remove windows look
3851  -     * updates it's <code>JSpinner</code> ancestors model. If a  -     * updates it's <code>JSpinner</code> ancestors model. If a
3852  -     * previousButton isn't needed (in a subclass) then override this method to  -     * previousButton isn't needed (in a subclass) then override this method to
3853  -     * return null.  -     * return null.
3854  -     *  -     *
3855  -     * @return a component that will replace the spinners model with the next  -     * @return a component that will replace the spinners model with the next
3856  -     *         value in the sequence, or null  -     *         value in the sequence, or null