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

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

Parent Directory | 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
  Author: <gregor+debian@comodo.priv.at>
  Description: remove windows look
- --- libjgoodies-looks-java.orig/build.xml
+ --- a/build.xml
- +++ libjgoodies-looks-java/build.xml
+ +++ b/build.xml
- @@ -90,7 +90,7 @@
+ @@ -94,7 +94,7 @@
       <!-- C O M P I L A T I O N                                             -->
       <!-- ***************************************************************** -->
          <target name="compile"
 Line 11 
 Description: remove windows look
                  description="Compiles the l&amp;fs, demo, and tests." />
       <!-- ***************************************************************** -->
- @@ -115,33 +115,11 @@
+ @@ -119,33 +119,11 @@
                  <copy toDir="${build.core.dir}" >
                          <fileset dir="${src.core.dir}"
                                           includes="com/jgoodies/looks/common/shadow.png,
 Line 46 
 Description: remove windows look
       <target name="compile-tests" depends="compile-core" if="junit.jar.present"
               description="Compiles the unit tests." >
           <mkdir dir="${build.test.dir}"/>
- @@ -209,7 +187,7 @@
+ @@ -213,7 +191,7 @@
       <!-- J A R                                                                        -->
       <!-- ***************************************************************** -->
          <target name="jar"
 Line 55 
 Description: remove windows look
                  description="Creates library and example jars." >
          </target>
- @@ -264,20 +242,6 @@
+ @@ -268,20 +246,6 @@
          </target>
       <!-- ***************************************************************** -->
 Line 76 
 Description: remove windows look
          <target name="jar-demo" depends="jar-plastic"
                  description="Creates the demo jar." >
                  <jar
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/Options.java
+ --- a/src/core/com/jgoodies/looks/Options.java
- +++ libjgoodies-looks-java/src/core/com/jgoodies/looks/Options.java
+ +++ b/src/core/com/jgoodies/looks/Options.java
- @@ -38,8 +38,6 @@
+ @@ -40,8 +40,6 @@
   import com.jgoodies.looks.common.ShadowPopup;
   import com.jgoodies.looks.plastic.PlasticLookAndFeel;
 Line 86 
 Description: remove windows look
  -import com.sun.java.swing.plaf.windows.WindowsComboBoxUI;
   /**
    * Provides access to optional features of the JGoodies L&amp;Fs
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsArrowButton.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsArrowButton.java
  +++ /dev/null
  @@ -1,142 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
 Line 130 
 Description: remove windows look
  -import javax.swing.plaf.basic.BasicArrowButton;
  -
  -/**
  - * The JGoodies Windows Look&amp;Feel implementation for
  - * arrow buttons used in scrollbars and comboboxes.
  - * <p>
  - * It differs from <code>BasicArrowButton</code> in that the preferred size
  - * is always a square.
  - * It differs from <code>WindowsScrollBarUI.WindowsArrowButton</code>
  - * in that the triangle is black and positioned correctly.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -final class WindowsArrowButton extends BasicArrowButton {
  -
 Line 232 
 Description: remove windows look
  -        g.setColor(oldColor);
  -    }
  -}
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsBorders.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsBorders.java
  +++ /dev/null
- @@ -1,589 +0,0 @@
+ @@ -1,584 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
 Line 272 
 Description: remove windows look
  -import java.awt.Graphics;
  -import java.awt.Insets;
  -
- -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;
  -import javax.swing.border.AbstractBorder;
  -import javax.swing.border.Border;
  -import javax.swing.border.CompoundBorder;
-Line 288 
 Description: remove windows look
+Line 283 
 Description: remove windows look
  -import javax.swing.plaf.basic.BasicGraphicsUtils;
  -
  -/**
  - * Consists of static inner classes that define different
  - * <code>Borders</code> used in the JGoodies Windows look&amp;feel.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.5 $
+ - * @version $Revision: 1.7 $
  - */
  -final class WindowsBorders {
  -
  -    private WindowsBorders() {
  -        // Overrides default constructor; prevents instantiation.
  -    }
  -
  -       // Accessing and Creating Borders ***************************************************
  -
  -    private static Border menuBorder;
-Line 388 
 Description: remove windows look
+Line 383 
 Description: remove windows look
  -    }
  -
  -    /**
  -     * Returns a special border for a <code>JMenuBar</code> that
  -     * is used in a header just above a <code>JToolBar</code>.
  -     */
  -    static Border getMenuBarHeaderBorder() {
-Line 402 
 Description: remove windows look
+Line 397 
 Description: remove windows look
  -
  -    /**
  -     * Returns a border instance for a <code>JPopupMenu</code>.
  -     *
  -     * @return the lazily created popup menu border
  -     */
  -    static Border getPopupMenuBorder() {
-Line 414 
 Description: remove windows look
+Line 409 
 Description: remove windows look
  -
  -    /**
  -     * Returns a no-margin border instance for a <code>JPopupMenu</code>.
  -     *
  -     * @return the lazily created no-margin popup menu border
  -     */
  -    static Border getNoMarginPopupMenuBorder() {
-Line 425 
 Description: remove windows look
+Line 420 
 Description: remove windows look
  -    }
  -
  -    /**
  -     * Returns a special border for a <code>JToolBar</code> that
  -     * is used in a header just below a <code>JMenuBar</code>.
  -     */
  -    static Border getToolBarHeaderBorder() {
  -               if (toolBarHeaderBorder == null) {
  -               toolBarHeaderBorder = new BorderUIResource.CompoundBorderUIResource(
  -                                                                               new ToolBarHeaderBorder(),
  -                                                                               new BasicBorders.MarginBorder());
-Line 441 
 Description: remove windows look
+Line 436 
 Description: remove windows look
  -     * Returns a border for a rollover <code>AbstractButton</code>.
  -     */
  -    static Border getRolloverButtonBorder() {
  -               if (rolloverButtonBorder == null) {
  -            rolloverButtonBorder = new CompoundBorder( // No UIResource
  -                                        new RolloverButtonBorder(),
  -                                        new RolloverMarginBorder());
-Line 455 
 Description: remove windows look
+Line 450 
 Description: remove windows look
  -
  -       // Copied from BasicBorders, has correct black color for the outer default rectangle.
  -   private static final class ButtonBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
  -
  -        private final Color shadow;
  -        private final Color darkShadow;
  -        private final Color highlight;
  -        private final Color lightHighlight;
  -        private final Color defaultColor;
  -
  -        public ButtonBorder(Color shadow, Color darkShadow,
  -                             Color highlight, Color lightHighlight, Color defaultColor) {
  -            this.shadow = shadow;
  -            this.darkShadow = darkShadow;
  -            this.highlight = highlight;
  -            this.lightHighlight = lightHighlight;
  -            this.defaultColor = defaultColor;
  -        }
-Line 476 
 Description: remove windows look
+Line 471 
 Description: remove windows look
  -        public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
  -            boolean isPressed = false;
  -            boolean isDefault = false;
  -
  -            if (c instanceof AbstractButton) {
  -                       AbstractButton b = (AbstractButton) c;
  -                       ButtonModel model = b.getModel();
  -
  -                       isPressed = model.isPressed() && model.isArmed();
  -                if (c instanceof JButton) {
  -                    isDefault = ((JButton) c).isDefaultButton();
  -                }
  -            }
  -            drawBezel(g, x, y, width, height, isPressed, isDefault, shadow,
  -                      darkShadow, highlight, lightHighlight, defaultColor);
  -        }
-Line 526 
 Description: remove windows look
+Line 521 
 Description: remove windows look
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -       /**
  -        * A border used for <code>Buttons</code> that have the rollover property enabled.
  -        */
  -       private static final class RolloverButtonBorder extends AbstractButtonBorder {
  -
  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
  -                       AbstractButton b = (AbstractButton) c;
  -                       ButtonModel model = b.getModel();
-Line 568 
 Description: remove windows look
+Line 563 
 Description: remove windows look
  -    private static final class RolloverMarginBorder extends EmptyBorder {
  -
  -        private RolloverMarginBorder() {
  -            super(1, 1, 1, 1);
  -        }
  -
  -
-Line 602 
 Description: remove windows look
+Line 597 
 Description: remove windows look
  -
  -       /**
  -        * A border that looks like a separator line; used for menu bars and tool bars.
  -        */
  -       private static final class SeparatorBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(0, 3, 2, 1);
-Line 616 
 Description: remove windows look
+Line 611 
 Description: remove windows look
  -                       g.drawLine( 0, h - 1, w - 1, h - 1 );
  -                       g.translate(-x, -y);
  -               }
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -       /**
  -        * A thin raised border.
  -        */
  -       static final class ThinRaisedBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);
-Line 631 
 Description: remove windows look
+Line 626 
 Description: remove windows look
  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
  -                       WindowsUtils.drawFlush3DBorder(g, x, y, w, h);
  -               }
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -       /**
  -        * A thin lowered border.
  -        */
  -       static final class ThinLoweredBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);
-Line 646 
 Description: remove windows look
+Line 641 
 Description: remove windows look
  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
  -                       WindowsUtils.drawPressed3DBorder(g, x, y, w, h);
  -               }
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -       /**
  -        * A border used for menu bars and tool bars in <code>HeaderStyle.SINGLE</code>.
  -        * The bar is wrapped by an inner thin raised border,
  -        * which in turn is wrapped by an outer thin lowered border.
  -        */
  -       private static final class EtchedBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(2, 2, 2, 2);
-Line 667 
 Description: remove windows look
+Line 662 
 Description: remove windows look
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -       /**
  -        * A border used for menu bars in <code>HeaderStyle.BOTH</code>.
  -        * 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
  -        */
  -       private static final class MenuBarHeaderBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(2, 2, 1, 2);
  -
  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
  -                       WindowsUtils.drawPressed3DBorder(g, x, y, w, h + 1);
-Line 685 
 Description: remove windows look
+Line 680 
 Description: remove windows look
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -    private static final class PopupMenuBorder extends AbstractBorder implements UIResource {
  -
  -        private static final Insets INSETS = new Insets(3, 3, 3, 3);
-Line 703 
 Description: remove windows look
+Line 698 
 Description: remove windows look
  -
  -        public Insets getBorderInsets(Component c) { return INSETS; }
  -    }
  -
  -
  -    private static final class NoMarginPopupMenuBorder extends AbstractBorder implements UIResource {
  -
-Line 720 
 Description: remove windows look
+Line 715 
 Description: remove windows look
  -
  -        public Insets getBorderInsets(Component c) { return INSETS; }
  -    }
  -
  -       /**
  -        * A border used for tool bars in <code>HeaderStyle.BOTH</code>.
  -        * 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
  -        */
  -       private static final class ToolBarHeaderBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(1, 2, 2, 2);
  -
  -               public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) {
  -                       WindowsUtils.drawPressed3DBorder(g, x, y - 1, w, h + 1);
-Line 737 
 Description: remove windows look
+Line 732 
 Description: remove windows look
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -       }
  -
  -
  -       /**
  -        * A border used for menus.
  -        */
  -       private static final class MenuBorder extends AbstractBorder implements UIResource {
  -
  -               private static final Insets INSETS = new Insets(1, 1, 1, 1);
  -
  -               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
  -                               WindowsUtils.drawFlush3DBorder(g, x, y, w, h);
  -                       //}
  -               }
  -
  -               public Insets getBorderInsets(Component c) { return INSETS; }
  -
  -       }
-Line 767 
 Description: remove windows look
+Line 762 
 Description: remove windows look
  -    // Helper Code **********************************************************************
  -
  -       // Copied from BasicGraphicsUtils, has an additional color for the default rectangle.
  -    private static void drawBezel(Graphics g, int x, int y, int w, int h,
  -                                 boolean isPressed, boolean isDefault,
  -                                 Color shadow, Color darkShadow,
  -                                 Color highlight, Color lightHighlight, Color defaultColor)
  -    {
  -        Color oldColor = g.getColor();  // Make no net change to g
  -        g.translate(x, y);
  -
  -        if (isPressed && isDefault) {
  -            g.setColor(darkShadow);
  -            g.drawRect(0, 0, w - 1, h - 1);
-Line 784 
 Description: remove windows look
+Line 779 
 Description: remove windows look
  -            BasicGraphicsUtils.drawLoweredBezel(g, x, y, w, h,
  -                             shadow, darkShadow, highlight, lightHighlight);
  -        } else if (isDefault) {
  -            g.setColor(defaultColor);
  -            g.drawRect(0, 0, w-1, h-1);
  -
  -            g.setColor(lightHighlight);
  -            g.drawLine(1, 1, 1, h-3);
  -            g.drawLine(2, 1, w-3, 1);
  -
-Line 799 
 Description: remove windows look
+Line 794 
 Description: remove windows look
  -            g.drawLine(2, h-3, w-3, h-3);
  -            g.drawLine(w-3, 2, w-3, h-4);
  -
  -            g.setColor(darkShadow);
  -            g.drawLine(1, h-2, w-2, h-2);
  -            g.drawLine(w-2, h-2, w-2, 1);
  -        } else {
  -            g.setColor(lightHighlight);
  -            g.drawLine(0, 0, 0, h-1);
  -            g.drawLine(1, 0, w-2, 0);
  -
-Line 815 
 Description: remove windows look
+Line 810 
 Description: remove windows look
  -            g.drawLine(1, h-2, w-2, h-2);
  -            g.drawLine(w-2, 1, w-2, h-3);
  -
  -            g.setColor(darkShadow);
  -            g.drawLine(0, h-1, w-1, h-1);
  -            g.drawLine(w-1, h-1, w-1, 0);
  -        }
-Line 824 
 Description: remove windows look
+Line 819 
 Description: remove windows look
  -    }
  -
  -}
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsButtonUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsButtonUI.java
  +++ /dev/null
  @@ -1,71 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 868 
 Description: remove windows look
+Line 863 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows look&amp;feel implementation of <code>ButtonUI</code>.<p>
  - *
  - * Unlike its superclass it returns even and odd preferred heights.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -public final class WindowsButtonUI extends com.sun.java.swing.plaf.windows.WindowsButtonUI {
  -
-Line 899 
 Description: remove windows look
+Line 894 
 Description: remove windows look
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsComboBoxEditor.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsComboBoxEditor.java
  +++ /dev/null
  @@ -1,71 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 939 
 Description: remove windows look
+Line 934 
 Description: remove windows look
  -import com.jgoodies.looks.common.ComboBoxEditorTextField;
  -
  -/**
  - * The default editor for editable combo boxes in the
  - * JGoodies Windows Look&amp;Feel.<p>
  - *
  - * It differs from its superclass in that the border is quite the same as for
  - * text fields: a compound border with an inner <code>MarginBorder</code>.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.6 $
+ - * @version $Revision: 1.8 $
  - */
  -class WindowsComboBoxEditor extends BasicComboBoxEditor {
  -
-Line 967 
 Description: remove windows look
+Line 962 
 Description: remove windows look
  -     */
  -    static final class UIResource extends WindowsComboBoxEditor implements
  -            javax.swing.plaf.UIResource {
  -
  -        UIResource(boolean isTableCellEditor) {
  -            super(isTableCellEditor);
  -        }
  -    }
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsComboBoxUI.java
  +++ /dev/null
  @@ -1,557 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 1028 
 Description: remove windows look
+Line 1023 
 Description: remove windows look
  -import com.sun.java.swing.plaf.windows.WindowsTextFieldUI;
  -
  -/**
  - * The JGoodies Windows Look&amp;Feel implementation of
  - * {@link javax.swing.plaf.ComboBoxUI}.
  - * Corrects the editor insets for editable combo boxes
  - * as well as the render insets for non-editable combos. And it has
  - * the same height as text fields - unless you change the renderer.<p>
  - *
  - * Also, this class offers to use the combo's popup prototype display value
  - * to compute the popup menu width. This is an optional feature of
  - * the JGoodies Windows L&amp;f implemented via a client property key.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.19 $
+ - * @version $Revision: 1.21 $
  - *
  - * @see Options#COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY
  - */
  -public class WindowsComboBoxUI extends com.sun.java.swing.plaf.windows.WindowsComboBoxUI {
  -
  -    private static final String CELL_EDITOR_KEY = "JComboBox.isTableCellEditor";
  -
  -    /**
  -     * Used to determine the minimum height of a text field,
  -     * which in turn is used to answer the combobox's minimum height.
  -     */
  -    private static final JTextField PHANTOM = new JTextField("Phantom");
  -
  -    private static final Insets EMPTY_INSETS = new Insets(0, 0, 0, 0);
  -    private static final Border EMPTY_BORDER = new EmptyBorder(EMPTY_INSETS);
  -
  -
  -    private boolean tableCellEditor;
  -    private PropertyChangeListener propertyChangeListener;
  -
  -
  -    // ************************************************************************
  -
  -    public static ComponentUI createUI(JComponent b) {
  -        ensurePhantomHasWindowsUI();
  -        return new WindowsComboBoxUI();
  -    }
  -
  -
  -    /**
  -     * Ensures that the phantom text field has a Windows text field UI.
  -     */
-Line 1077 
 Description: remove windows look
+Line 1072 
 Description: remove windows look
  -            PHANTOM.updateUI();
  -        }
  -    }
  -
  -
  -    // ************************************************************************
  -
  -    public void installUI(JComponent c) {
  -        super.installUI(c);
  -        tableCellEditor = isTableCellEditor();
  -    }
  -
  -    protected void installListeners() {
  -        super.installListeners();
  -        propertyChangeListener = new TableCellEditorPropertyChangeHandler();
  -        comboBox.addPropertyChangeListener(CELL_EDITOR_KEY, propertyChangeListener);
  -    }
  -
  -    protected void uninstallListeners() {
  -        super.uninstallListeners();
  -        comboBox.removePropertyChangeListener(CELL_EDITOR_KEY, propertyChangeListener);
  -        propertyChangeListener = null;
  -    }
  -
  -
  -    /**
  -     * Creates the arrow button that is to be used in the combo box.<p>
  -     *
  -     * Overridden to paint black triangles.
  -     */
  -    protected JButton createArrowButton() {
-Line 1109 
 Description: remove windows look
+Line 1104 
 Description: remove windows look
  -                    ? super.createArrowButton()
  -                    : new WindowsArrowButton(SwingConstants.SOUTH);
  -    }
  -
  -
  -    /**
  -     * Creates the editor that is to be used in editable combo boxes.
  -     * This method only gets called if a custom editor has not already
  -     * been installed in the JComboBox.
  -     */
  -    protected ComboBoxEditor createEditor() {
-Line 1122 
 Description: remove windows look
+Line 1117 
 Description: remove windows look
  -
  -
  -    /**
  -     * Creates a layout manager for managing the components which
  -     * make up the combo box.<p>
  -     *
  -     * Overriden to use a layout that has a fixed width arrow button.
  -     *
  -     * @return an instance of a layout manager
  -     */
  -    protected LayoutManager createLayoutManager() {
-Line 1140 
 Description: remove windows look
+Line 1135 
 Description: remove windows look
  -            editor.setBackground(UIManager.getColor("ComboBox.disabledBackground"));
  -        }
  -    }
  -
  -    /**
  -     * Creates a ComboPopup that honors the optional combo popup display value
  -     * that is used to compute the popup menu width.
  -     */
  -    protected ComboPopup createPopup() {
  -        return new WindowsComboPopup(comboBox);
  -    }
  -
  -
  -    /**
  -     * Creates the default renderer that will be used in a non-editiable combo
  -     * box. A default renderer will used only if a renderer has not been
  -     * explicitly set with <code>setRenderer</code>.<p>
  -     *
  -     * This method differs from the superclass implementation in that
  -     * it uses an empty border with the default left and right text insets,
  -     * the same as used by a combo box editor.
  -     *
  -     * @return a <code>ListCellRender</code> used for the combo box
  -     * @see javax.swing.JComboBox#setRenderer
  -     */
-Line 1185 
 Description: remove windows look
+Line 1180 
 Description: remove windows look
  -        int buttonWidth = getEditableButtonWidth();
  -        size.width +=  insets.left + insets.right + buttonWidth;
  -        // The combo editor benefits from extra space for the caret.
  -        // To make editable and non-editable equally wide,
  -        // we always add 1 pixel.
  -        size.width += 1;
  -
  -        // Honor corrections made in #paintCurrentValue
  -        ListCellRenderer renderer = comboBox.getRenderer();
  -        if (renderer instanceof JComponent) {
-Line 1202 
 Description: remove windows look
+Line 1197 
 Description: remove windows look
  -            size.width += offsetLeft + offsetRight;
  -            //size.height += offsetTop + offsetBottom;
  -        }
  -
  -        // The height is oriented on the JTextField height
  -        Dimension textFieldSize = PHANTOM.getMinimumSize();
  -        size.height = (LookUtils.IS_OS_WINDOWS_VISTA && !LookUtils.IS_LAF_WINDOWS_XP_ENABLED)
  -           ? textFieldSize.height
  -           : Math.max(textFieldSize.height, size.height);
  -
  -        cachedMinimumSize.setSize(size.width, size.height);
  -        isMinimumSizeDirty = false;
  -
  -        return new Dimension(size);
  -    }
  -
-Line 1223 
 Description: remove windows look
+Line 1218 
 Description: remove windows look
  -        return getMinimumSize(c);
  -    }
  -
  -
  -    /**
  -     * Paints the currently selected item.
  -     */
-Line 1265 
 Description: remove windows look
+Line 1260 
 Description: remove windows look
  -            bounds.width  -= offsetLeft + offsetRight - 1;
  -            bounds.height -= offsetTop + offsetBottom;
  -        }
  -
  -        c.setFont(comboBox.getFont());
  -        if (hasFocus && !isPopupVisible(comboBox) && !isVistaReadOnlyCombo) {
  -            c.setForeground(listBox.getSelectionForeground());
-Line 1298 
 Description: remove windows look
+Line 1293 
 Description: remove windows look
  -                if ((width % 2) == 0) {
  -                    width += 1;
  -                }
  -                WindowsUtils.drawRoundedDashedRect(g,
  -                        originalBounds.x+1, originalBounds.y+1,
  -                        width, originalBounds.height-2);
  -            } /*else {
  -                BasicGraphicsUtils.drawDashedRect(g,
-Line 1314 
 Description: remove windows look
+Line 1309 
 Description: remove windows look
  -            ((JComponent) c).setBorder(oldBorder);
  -        }
  -    }
  -
  -    /**
  -     * Checks and answer whether the border of the given renderer component
  -     * can be removed temporarily, so the combo's selection background will
  -     * be consistent with the default renderer and native appearance.
  -     * This test is invoked from <code>#paintCurrentValue</code>.<p>
  -     *
  -     * It is safe to remove an EmptyBorder if the component doesn't override
  -     * <code>#update</code>, <code>#paint</code> and <code>#paintBorder</code>.
  -     * Since we know the default renderer, we can remove its border.<p>
  -     *
  -     * Custom renderers may set a hint to make their border removable.
  -     * To do so, set the client property "isBorderRemovable"
  -     * to <code>Boolean.TRUE</code>. If this client property is set,
  -     * its value will be returned. If it is not set, <code>true</code> is returned
  -     * if and only if the component's border is an EmptyBorder.
  -     *
  -     * @param rendererComponent  the renderer component to check
  -     * @return true if the component's border can be removed, false if not
  -     * @see #paintCurrentValue(Graphics, Rectangle, boolean)
-Line 1344 
 Description: remove windows look
+Line 1339 
 Description: remove windows look
  -        Border border = rendererComponent.getBorder();
  -        return border instanceof EmptyBorder;
  -    }
  -
  -
  -    private boolean isVistaXPStyleReadOnlyCombo() {
  -        return     LookUtils.IS_OS_WINDOWS_VISTA
  -                && LookUtils.IS_LAF_WINDOWS_XP_ENABLED
  -                && !comboBox.isEditable();
  -    }
  -
  -
  -    /**
  -     * Returns the area that is reserved for drawing the currently selected item.
  -     */
-Line 1378 
 Description: remove windows look
+Line 1373 
 Description: remove windows look
  -                    height - (insets.top  + insets.bottom));
  -        }
  -    }
  -
  -
  -    // Helper Code ************************************************************
  -
  -    /**
  -     * Computes and returns the width of the arrow button in editable state.
  -     *
  -     * @return the width of the arrow button in editable state
  -     */
  -    private int getEditableButtonWidth() {
  -        return UIManager.getInt("ScrollBar.width");
  -    }
  -
  -    /**
  -     * Checks and answers if this UI's combo has a client property
  -     * that indicates that the combo is used as a table cell editor.
  -     *
  -     * @return <code>true</code> if the table cell editor client property
  -     *    is set to <code>Boolean.TRUE</code>, <code>false</code> otherwise
  -     */
  -    private boolean isTableCellEditor() {
  -        return Boolean.TRUE.equals(comboBox.getClientProperty(CELL_EDITOR_KEY));
  -    }
  -
  -
  -    // Collaborator Classes ***************************************************
  -
  -    /**
  -     * This layout manager handles the 'standard' layout of combo boxes.
  -     * It puts the arrow button to the right and the editor to the left.
  -     * If there is no editor it still keeps the arrow button to the right.
  -     *
  -     * Overriden to use a fixed arrow button width.
  -     */
  -    private final class WindowsComboBoxLayoutManager
  -        extends BasicComboBoxUI.ComboBoxLayoutManager {
-Line 1444 
 Description: remove windows look
+Line 1439 
 Description: remove windows look
  -                editor.setBounds(rectangleForCurrentValue());
  -            }
  -        }
  -
  -   }
  -
  -
  -    /**
  -     * Differs from the BasicComboPopup in that it uses the standard
  -     * popmenu border and honors an optional popup prototype display value.
  -     */
  -    private static final class WindowsComboPopup extends BasicComboPopup {
-Line 1459 
 Description: remove windows look
+Line 1454 
 Description: remove windows look
  -        }
  -
  -        /**
  -         * Calculates the placement and size of the popup portion
  -         * of the combo box based on the combo box location and
  -         * the enclosing screen bounds. If no transformations are required,
  -         * then the returned rectangle will have the same values
  -         * as the parameters.<p>
  -         *
  -         * In addition to the superclass behavior, this class offers
  -         * to use the combo's popup prototype display value to compute
  -         * the popup menu width. This is an optional feature of
  -         * the JGoodies Windows L&amp;f implemented via a client property key.<p>
  -         *
  -         * If a prototype is set, the popup width is the maximum of the
  -         * combobox width and the prototype based popup width.
  -         * For the latter the renderer is used to render the prototype.
  -         * The prototype based popup width is the prototype's width
  -         * plus the scrollbar width - if any. The scrollbar test checks
  -         * if there are more items than the combo's maximum row count.
  -         *
  -         * @param px starting x location
  -         * @param py starting y location
  -         * @param pw starting width
  -         * @param ph starting height
  -         * @return a rectangle which represents the placement and size of the popup
  -         *
  -         * @see Options#COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY
  -         * @see JComboBox#getMaximumRowCount()
  -         */
  -        protected Rectangle computePopupBounds(int px, int py, int pw, int ph) {
  -            Rectangle defaultBounds = super.computePopupBounds(px, py, pw, ph);
  -            Object popupPrototypeDisplayValue = comboBox.getClientProperty(
  -                    Options.COMBO_POPUP_PROTOTYPE_DISPLAY_VALUE_KEY);
  -            if (popupPrototypeDisplayValue == null) {
  -                return defaultBounds;
  -            }
  -
  -            ListCellRenderer renderer = list.getCellRenderer();
  -            Component c = renderer.getListCellRendererComponent(
  -                    list, popupPrototypeDisplayValue, -1, true, true);
  -            pw = c.getPreferredSize().width;
  -            boolean hasVerticalScrollBar =
  -                comboBox.getItemCount() > comboBox.getMaximumRowCount();
  -            if (hasVerticalScrollBar) {
  -                // Add the scrollbar width.
-Line 1511 
 Description: remove windows look
+Line 1506 
 Description: remove windows look
  -                : defaultBounds;
  -        }
  -
  -    }
  -
  -
  -    // Handling Combo Changes *************************************************
  -
  -    /**
  -     * Listens to changes in the table cell editor client property
  -     * and updates the default editor - if any - to use the correct
-Line 1534 
 Description: remove windows look
+Line 1529 
 Description: remove windows look
  -    }
  -
  -}
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsFieldCaret.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsFieldCaret.java
  +++ /dev/null
- @@ -1,347 +0,0 @@
+ @@ -1,367 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 1581 
 Description: remove windows look
+Line 1576 
 Description: remove windows look
  -import javax.swing.plaf.UIResource;
  -import javax.swing.text.*;
  -
+ -import com.jgoodies.looks.Options;
+ -
  -/**
  - * WindowsFieldCaret has different scrolling behavior than the DefaultCaret.
  - * Also, this caret is visible in non-editable fields,
  - * and the text is selected after a keyboard focus gained event.
  - * For the latter see also issue #4337647 in Sun's bug database.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.5 $
+ - * @version $Revision: 1.10 $
  - *
  - */
  -final class WindowsFieldCaret extends DefaultCaret implements UIResource {
  -
  -    private static final LayeredHighlighter.LayerPainter WindowsPainter =
  -        new WindowsHighlightPainter(null);
  -
  -
-Line 1608 
 Description: remove windows look
+Line 1605 
 Description: remove windows look
  -
  -
  -    public void focusGained(FocusEvent e) {
- -        if (getComponent().isEnabled()) {
+ -        final JTextComponent c = getComponent();
+ -        if (c.isEnabled()) {
  -            setVisible(true);
  -            setSelectionVisible(true);
  -        }
- -
+ -        if (!c.isEditable()) {
- -        final JTextComponent c = getComponent();
+ -            return;
- -        if (c.isEnabled() && isKeyboardFocusEvent) {
+ -        }
+ -        if (   c.isEnabled()
+ -                && isKeyboardFocusEvent
+ -                && Options.isSelectOnFocusGainActive(c)) {
  -            if (c instanceof JFormattedTextField) {
  -                EventQueue.invokeLater(new Runnable() {
  -                    public void run() {
- -                        WindowsFieldCaret.super.setDot(0);
+ -                        selectAll();
- -                        WindowsFieldCaret.super.moveDot(c.getDocument().getLength());
  -                    }
  -                });
  -            } else {
- -                super.setDot(0);
+ -                selectAll();
- -                super.moveDot(c.getDocument().getLength());
  -            }
  -        }
  -    }
  -
  -
+ -    private void selectAll() {
+ -        final JTextComponent c = getComponent();
+ -        boolean backward = Boolean.TRUE.equals(c.getClientProperty(Options.INVERT_SELECTION_CLIENT_KEY));
+ -        if (backward) {
+ -            setDot(c.getDocument().getLength());
+ -            moveDot(0);
+ -        } else {
+ -            setDot(0);
+ -            moveDot(c.getDocument().getLength());
+ -        }
+ -    }
+ -
+ -
  -    public void focusLost(FocusEvent e) {
  -        super.focusLost(e);
  -        if (!e.isTemporary()) {
  -            isKeyboardFocusEvent = true;
+ -            if (Boolean.TRUE.equals(getComponent().getClientProperty(Options.SET_CARET_TO_START_ON_FOCUS_LOST_CLIENT_KEY))) {
+ -                setDot(0);
+ -            }
  -        }
  -    }
  -
-Line 1649 
 Description: remove windows look
+Line 1664 
 Description: remove windows look
  -
  -    public void mouseReleased(MouseEvent e) {
  -        super.mouseReleased(e);
  -        // super.mousePressed() does not transfer focus on popup clicks.
  -        // Windows does.
  -        if (e.isPopupTrigger()) {
  -            isKeyboardFocusEvent = false;
-Line 1727 
 Description: remove windows look
+Line 1742 
 Description: remove windows look
  -            }
  -        }
  -
- -        private Rectangle r;
+ -        private final Rectangle r;
  -    }
  -
  -    // Helper Classes *********************************************************
  -
  -    private static final class WindowsHighlightPainter extends
  -            DefaultHighlighter.DefaultHighlightPainter {
  -        WindowsHighlightPainter(Color c) {
-Line 1884 
 Description: remove windows look
+Line 1899 
 Description: remove windows look
  -    }
  -
  -}
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsFormattedTextFieldUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsFormattedTextFieldUI.java
  +++ /dev/null
  @@ -1,68 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 1926 
 Description: remove windows look
+Line 1941 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows L&amp;F implementation of <code>FormattedTextFieldUI</code>.
  - * It uses a caret that selects all text if the field gains focus
  - * after a keyboard focus traversal.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.2 $
+ - * @version $Revision: 1.4 $
  - */
  -public final class WindowsFormattedTextFieldUI extends BasicFormattedTextFieldUI {
  -
  -    /**
  -     * Creates a UI for a JFormattedTextField.
  -     *
-Line 1955 
 Description: remove windows look
+Line 1970 
 Description: remove windows look
  -    }
  -
  -}
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsIconFactory.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsIconFactory.java
  +++ /dev/null
- @@ -1,219 +0,0 @@
+ @@ -1,215 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 1994 
 Description: remove windows look
+Line 2009 
 Description: remove windows look
  -import java.awt.Graphics;
  -import java.io.Serializable;
  -
- -import javax.swing.AbstractButton;
+ -import javax.swing.*;
- -import javax.swing.ButtonModel;
- -import javax.swing.Icon;
- -import javax.swing.JCheckBox;
- -import javax.swing.UIManager;
  -import javax.swing.plaf.UIResource;
  -
  -/**
  - * Factory class that vends <code>Icon</code>s used in the JGoodies Windows look&amp;feel.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -final class WindowsIconFactory {
  -
  -    private WindowsIconFactory() {
  -        // Overrides default constructor; prevents instantiation.
  -    }
  -
  -       // Accessing and Creating Icons *****************************************************
  -
  -    private static Icon checkBoxIcon;
-Line 2042 
 Description: remove windows look
+Line 2053 
 Description: remove windows look
  -
  -
  -       // Helper Classes *******************************************************************
  -
  -       // Paints the icon for a check box.
  -    private static class CheckBoxIcon implements Icon, Serializable {
  -
  -               private static final int SIZE  = 13;
  -
  -               public void paintIcon(Component c, Graphics g, int x, int y) {
  -                   JCheckBox cb = (JCheckBox) c;
  -                   ButtonModel model = cb.getModel();
  -
  -                   // outer bevel
  -                   if (!cb.isBorderPaintedFlat()) {
  -                // Outer top/left
  -                g.setColor(UIManager.getColor("CheckBox.shadow"));
  -                g.drawLine(x, y, x+11, y);
  -                g.drawLine(x, y+1, x, y+11);
  -
  -                // Outer bottom/right
  -                g.setColor(UIManager.getColor("CheckBox.highlight"));
  -                g.drawLine(x+12, y, x+12, y+12);
  -                g.drawLine(x, y+12, x+11, y+12);
  -
  -                // Inner top.left
  -                g.setColor(UIManager.getColor("CheckBox.darkShadow"));
  -                g.drawLine(x+1, y+1, x+10, y+1);
  -                g.drawLine(x+1, y+2, x+1, y+10);
  -
  -                // Inner bottom/right
  -                g.setColor(UIManager.getColor("CheckBox.light"));
  -                g.drawLine(x+1, y+11, x+11, y+11);
-Line 2077 
 Description: remove windows look
+Line 2088 
 Description: remove windows look
  -                               g.setColor(UIManager.getColor("CheckBox.shadow"));
  -                               g.drawRect(x+1, y+1, SIZE-3, SIZE-3);
  -                   }
  -                       // inside box
  -                       g.setColor(UIManager.getColor(
  -                                       (model.isPressed() && model.isArmed()) || !model.isEnabled()
  -                                               ? "CheckBox.background"
  -                                               : "CheckBox.interiorBackground"));
  -                       g.fillRect(x+2, y+2, SIZE-4, SIZE-4);
  -
  -                   g.setColor(UIManager.getColor(model.isEnabled()
  -                                                       ? "CheckBox.checkColor"  // Modified by JGoodies
  -                                                       : "CheckBox.shadow"));
  -
  -                   // paint check
  -                   if (model.isSelected()) {
  -                               g.drawLine(x+9, y+3, x+9, y+3);
-Line 2101 
 Description: remove windows look
+Line 2112 
 Description: remove windows look
  -                               g.drawLine(x+3, y+6, x+4, y+6);
  -                   }
  -               }
  -
  -               public int getIconWidth()  { return SIZE; }
  -               public int getIconHeight() { return SIZE; }
  -    }
  -
  -
  -       // Paints the icon for a radio button.
  -       private static class RadioButtonIcon implements Icon, UIResource, Serializable {
  -
  -               private static final int SIZE  = 13;
  -
  -               public void paintIcon(Component c, Graphics g, int x, int y) {
  -                   AbstractButton b = (AbstractButton) c;
  -                   ButtonModel model = b.getModel();
  -
  -                   // fill interior
  -                   g.setColor(UIManager.getColor(
  -                               (model.isPressed() && model.isArmed()) || !model.isEnabled()
  -                                               ? "RadioButton.background"
  -                                               : "RadioButton.interiorBackground"));
  -                   g.fillRect(x+2, y+2, 8, 8);
  -
  -
  -                       // outter left arc
  -                   g.setColor(UIManager.getColor("RadioButton.shadow"));
  -                   g.drawLine(x+4, y+0, x+7, y+0);
-Line 2132 
 Description: remove windows look
+Line 2143 
 Description: remove windows look
  -                   g.drawLine(x+1, y+2, x+1, y+3);
  -                   g.drawLine(x+0, y+4, x+0, y+7);
  -                   g.drawLine(x+1, y+8, x+1, y+9);
  -
  -                   // outter right arc
  -                   g.setColor(UIManager.getColor("RadioButton.highlight"));
  -                   g.drawLine(x+2, y+10, x+3, y+10);
-Line 2141 
 Description: remove windows look
+Line 2152 
 Description: remove windows look
  -                   g.drawLine(x+10, y+9, x+10, y+8);
  -                   g.drawLine(x+11, y+7, x+11, y+4);
  -                   g.drawLine(x+10, y+3, x+10, y+2);
  -
  -
  -                   // inner left arc
  -                   g.setColor(UIManager.getColor("RadioButton.darkShadow"));
  -                   g.drawLine(x+4, y+1, x+7, y+1);
-Line 2151 
 Description: remove windows look
+Line 2162 
 Description: remove windows look
  -                   g.drawLine(x+2, y+3, x+2, y+3);
  -                   g.drawLine(x+1, y+4, x+1, y+7);
  -                   g.drawLine(x+2, y+8, x+2, y+8);
  -
  -
  -                   // inner right arc
  -                   g.setColor(UIManager.getColor("RadioButton.light"));
  -                   g.drawLine(x+2,  y+9,  x+3,  y+9);
-Line 2161 
 Description: remove windows look
+Line 2172 
 Description: remove windows look
  -                   g.drawLine(x+9,  y+8,  x+9,  y+8);
  -                   g.drawLine(x+10, y+7,  x+10, y+4);
  -                   g.drawLine(x+9,  y+3,  x+9,  y+3);
  -
  -
  -                   // indicate whether selected or not
  -                   if(model.isSelected()) {
  -                               g.setColor(UIManager.getColor("RadioButton.checkColor")); // Modified by JGoodies
  -                               g.fillRect(x+4, y+5, 4, 2);
  -                               g.fillRect(x+5, y+4, 2, 4);
  -                   }
  -               }
  -
  -               public int getIconWidth()  { return SIZE; }
  -               public int getIconHeight() { return SIZE; }
  -
  -    }
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsLookAndFeel.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsLookAndFeel.java
  +++ /dev/null
- @@ -1,760 +0,0 @@
+ @@ -1,759 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 2218 
 Description: remove windows look
+Line 2229 
 Description: remove windows look
  -import java.awt.Insets;
  -import java.lang.reflect.Method;
  -
- -import javax.swing.Icon;
+ -import javax.swing.*;
- -import javax.swing.JComponent;
- -import javax.swing.UIDefaults;
- -import javax.swing.UIManager;
  -import javax.swing.border.Border;
  -import javax.swing.border.EmptyBorder;
  -import javax.swing.plaf.DimensionUIResource;
-Line 2239 
 Description: remove windows look
+Line 2247 
 Description: remove windows look
  - * This look provides several corrections and extensions to Sun's Windows L&F.
  - * In addition it tries to provide a unified look for the J2SE 1.4.0x, 1.4.1x,
  - * 1.4.2, and 1.5 environments.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.36 $
+ - * @version $Revision: 1.39 $
  - */
  -public final class WindowsLookAndFeel extends com.sun.java.swing.plaf.windows.WindowsLookAndFeel {
  -
  -    /**
  -     * An optional client property key for JMenu and JToolBar
  -     * to set a border style - shadows the header style.
  -     */
  -    public static final String BORDER_STYLE_KEY = "jgoodies.windows.borderStyle";
- -
- -
- -    public String getID() {
- -        return "JGoodies Windows";
- -    }
  -
  -
+ -    /**
+ -     * Returns the String &quot;JGoodies Windows&quot;.
+ -     * Note that this L&amp;f's ID (&quot;Windows&quot;) is inherited
+ -     * from the superclass, because we don't do any fundamental changes.
+ -     *
+ -     * @see LookAndFeel#getID()
+ -     */
  -    public String getName() {
  -        return "JGoodies Windows";
  -    }
  -
  -
  -    public String getDescription() {
  -        return "The JGoodies Windows Look and Feel"
- -                + " - \u00a9 2001-2007 JGoodies Karsten Lentzsch";
+ -                + " - \u00a9 2001-2008 JGoodies Karsten Lentzsch";
  -    }
  -
  -
  -    // Optional Settings ******************************************************
  -
  -    /**
  -     * Looks up and retrieves the FontPolicy used by
  -     * the JGoodies Windows Look&amp;Feel.
  -     * If a FontPolicy has been set for this look, it'll be returned.
  -     * Otherwise, this method checks if a FontPolicy or FontSet is defined
  -     * in the system properties or UIDefaults. If so, it is returned.
  -     * If no FontPolicy has been set for this look, in the system
  -     * properties or UIDefaults, the default Windows font policy
  -     * will be returned.
  -     *
  -     * @return the FontPolicy set for this Look&amp;feel - if any,
  -     *     the FontPolicy specified in the system properties or UIDefaults
  -     *     - if any, or the default Windows font policy.
  -     *
  -     * @see #setFontPolicy
  -     * @see Options#WINDOWS_FONT_POLICY_KEY
  -     * @see FontPolicies
-Line 2291 
 Description: remove windows look
+Line 2301 
 Description: remove windows look
  -     * @see FontPolicies#getDefaultWindowsPolicy()
  -     */
  -    public static FontPolicy getFontPolicy() {
  -        FontPolicy policy =
  -            (FontPolicy) UIManager.get(Options.WINDOWS_FONT_POLICY_KEY);
  -        if (policy != null)
  -            return policy;
  -
  -        FontPolicy defaultPolicy = FontPolicies.getDefaultWindowsPolicy();
  -        return FontPolicies.customSettingsPolicy(defaultPolicy);
  -    }
  -
  -
  -    /**
  -     * Sets the FontPolicy to be used with the JGoodies Windows L&amp;F.
  -     * If the specified policy is <code>null</code>, the default will be reset.
  -     *
  -     * @param fontPolicy   the FontPolicy to be used with the JGoodies Windows
  -     *     L&amp;F, or <code>null</code> to reset to the default
  -     *
  -     * @see #getFontPolicy()
  -     * @see Options#WINDOWS_FONT_POLICY_KEY
  -     */
  -    public static void setFontPolicy(FontPolicy fontPolicy) {
  -        UIManager.put(Options.WINDOWS_FONT_POLICY_KEY, fontPolicy);
  -    }
  -
  -
  -    /**
  -     * Looks up and retrieves the MicroLayoutPolicy used by
  -     * the JGoodies Windows Look&amp;Feel.
  -     * If a MicroLayoutPolicy has been set for this look, it'll be returned.
  -     * Otherwise, the default Windows micro layout policy will be returned.
  -     *
  -     * @return the MicroLayoutPolicy set for this Look&amp;feel - if any,
  -     *     or the default Windows MicroLayoutPolicy.
  -     *
  -     * @see #setMicroLayoutPolicy
  -     * @see Options#WINDOWS_MICRO_LAYOUT_POLICY_KEY
  -     * @see MicroLayoutPolicies
  -     * @see MicroLayoutPolicies#getDefaultWindowsPolicy()
  -     */
  -    public static MicroLayoutPolicy getMicroLayoutPolicy() {
  -        MicroLayoutPolicy policy =
  -            (MicroLayoutPolicy) UIManager.get(Options.WINDOWS_MICRO_LAYOUT_POLICY_KEY);
  -        return policy != null
  -            ? policy
  -            : MicroLayoutPolicies.getDefaultWindowsPolicy();
  -    }
  -
  -
  -    /**
  -     * Sets the MicroLayoutPolicy to be used with the JGoodies Windows L&amp;F.
  -     * If the specified policy is <code>null</code>, the default will be reset.
  -     *
  -     * @param microLayoutPolicy   the MicroLayoutPolicy to be used with
  -     *     the JGoodies Windows L&amp;F, or <code>null</code> to reset
  -     *     to the default
  -     *
  -     * @see #getMicroLayoutPolicy()
  -     * @see Options#WINDOWS_MICRO_LAYOUT_POLICY_KEY
  -     */
  -    public static void setMicroLayoutPolicy(MicroLayout microLayoutPolicy) {
  -        UIManager.put(Options.WINDOWS_MICRO_LAYOUT_POLICY_KEY, microLayoutPolicy);
  -    }
  -
  -
  -    // Overriding Superclass Behavior ***************************************
  -
  -    /**
  -     * Invoked during <code>UIManager#setLookAndFeel</code>. In addition
  -     * to the superclass behavior, we install the ShadowPopupFactory.
  -     *
  -     * @see #uninitialize
  -     */
  -    public void initialize() {
  -        super.initialize();
  -        ShadowPopupFactory.install();
  -    }
  -
  -
  -    /**
  -     * Invoked during <code>UIManager#setLookAndFeel</code>. In addition
  -     * to the superclass behavior, we uninstall the ShadowPopupFactory.
  -     *
  -     * @see #initialize
  -     */
  -    public void uninitialize() {
-Line 2384 
 Description: remove windows look
+Line 2394 
 Description: remove windows look
  -    /**
  -     * Returns an icon with a disabled appearance. This method is used
  -     * to generate a disabled icon when one has not been specified.<p>
  -     *
  -     * This method will be used only on JDK 5.0 and later.
  -     *
  -     * @param component the component that will display the icon, may be null.
-Line 2410 
 Description: remove windows look
+Line 2420 
 Description: remove windows look
  -
  -        // Overwrite some of the uiDefaults.
  -        Object[] uiDefaults = {
  -            // Modified size
  -            "ComboBoxUI",            windowsPrefix + "ComboBoxUI",
  -
  -            // Modified preferred height: can be even or odd
  -            "ButtonUI",              windowsPrefix + "ButtonUI",
  -
  -            // Can installs an optional etched border
  -                       "ScrollPaneUI",          windowsPrefix + "ScrollPaneUI",
  -
  -            // Optional style and optional special borders
  -            "MenuBarUI",             windowsPrefix + "MenuBarUI",
  -
  -            // Provides an option for a no margin border
  -            "PopupMenuUI",           windowsPrefix + "PopupMenuUI",
  -
  -            // Honors the screen resolution and uses a minimum button width
  -            "OptionPaneUI",          windowsPrefix + "OptionPaneUI",
  -
  -            // 1.4.1 has ugly one touch triangles
  -            "SplitPaneUI",           windowsPrefix + "SplitPaneUI",
  -
  -            // Work in progress: Can have a flat presentation
  -            "TabbedPaneUI",          windowsPrefix + "TabbedPaneUI",
  -
  -            // Selects text after focus gained via keyboard
  -            "TextFieldUI",           windowsPrefix + "TextFieldUI",
  -            "FormattedTextFieldUI",  windowsPrefix + "FormattedTextFieldUI",
  -
  -            // Selects text after focus gained via keyboard
  -            // Renders a dot, not the star ("*") character on Java 1.4 and 5
  -            "PasswordFieldUI",       windowsPrefix + "PasswordFieldUI",
+ -
  -
- -
  -            // Updates the disabled and inactive background
  -            "TextAreaUI",            windowsPrefix + "TextAreaUI",
  -
  -            // Corrected position of the tree button icon
  -            "TreeUI",                windowsPrefix + "TreeUI",
  -
  -            // Just to use shared UI delegate
  -            "SeparatorUI",           windowsPrefix + "SeparatorUI"};
  -
  -        if (LookUtils.IS_JAVA_1_4_2_OR_LATER) {
  -            // Modified Border
  -            uiDefaults = append(uiDefaults,
  -            "SpinnerUI",             windowsPrefix + "SpinnerUI");
  -        }
  -
  -        // Aligned menu items
  -        if (  !LookUtils.IS_JAVA_6_OR_LATER
  -           || !LookUtils.IS_OS_WINDOWS_VISTA
  -           || !LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {
  -            uiDefaults = append(uiDefaults,
  -            "MenuItemUI",            windowsPrefix + "MenuItemUI");
  -            uiDefaults = append(uiDefaults,
  -            "CheckBoxMenuItemUI",    commonPrefix + "CheckBoxMenuItemUI");
  -            uiDefaults = append(uiDefaults,
  -            "RadioButtonMenuItemUI", commonPrefix + "RadioButtonMenuItemUI");
  -            // Has padding above and below the separator lines
  -            uiDefaults = append(uiDefaults,
  -            "PopupMenuSeparatorUI",  commonPrefix + "PopupMenuSeparatorUI");
  -        }
  -
  -        if (LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {
  -            // Aligned menu items
  -            if (!LookUtils.IS_JAVA_6_OR_LATER || !LookUtils.IS_OS_WINDOWS_VISTA) {
  -                uiDefaults = append(uiDefaults,
  -                "MenuUI",             windowsPrefix + "XPMenuUI");
  -            }
  -
  -            // Optional style and optional special borders;
  -            // rollover borders for compound buttons
  -            uiDefaults = append(uiDefaults,
  -                "ToolBarUI",          windowsPrefix + "XPToolBarUI");
  -
  -            // Honors XP table header style for custom user renderers.
  -            uiDefaults = append(uiDefaults,
  -                "TableHeaderUI",      windowsPrefix + "XPTableHeaderUI");
  -        } else {
  -            // Aligned menu items
  -            uiDefaults = append(uiDefaults,
  -                "MenuUI",             commonPrefix + "MenuUI");
  -
  -            // Optional style and optional special borders;
  -            // rollover borders corrected
  -            uiDefaults = append(uiDefaults,
  -                "ToolBarUI",          windowsPrefix + "ToolBarUI");
  -
  -            // Black arrows
  -            uiDefaults = append(uiDefaults,
  -                "ScrollBarUI",        windowsPrefix + "ScrollBarUI");
  -
  -            if (!LookUtils.IS_JAVA_1_4_2_OR_LATER) {
  -                // Uses unmodified size specified by "ToolBar.separatorSize"
  -                uiDefaults = append(uiDefaults,
  -                        "ToolBarSeparatorUI", windowsPrefix + "ToolBarSeparatorUI");
  -            }
  -        }
-Line 2516 
 Description: remove windows look
+Line 2526 
 Description: remove windows look
  -     */
  -    protected void initComponentDefaults(UIDefaults table) {
  -        super.initComponentDefaults(table);
  -
  -        final boolean isXP = LookUtils.IS_LAF_WINDOWS_XP_ENABLED;
  -        final boolean isClassic = !isXP;
  -        final boolean isVista = LookUtils.IS_OS_WINDOWS_VISTA;
-Line 2529 
 Description: remove windows look
+Line 2539 
 Description: remove windows look
  -        if (isXP && LookUtils.IS_JAVA_1_4) {
  -            initComponentDefaultsXP14(table);
  -        }
  -
  -        MicroLayout microLayout = getMicroLayoutPolicy().getMicroLayout("Windows", table);
  -        if (!isVista || !LookUtils.IS_JAVA_6_OR_LATER || !LookUtils.IS_LAF_WINDOWS_XP_ENABLED) {
  -            initMenuItemDefaults(table, microLayout);
-Line 2544 
 Description: remove windows look
+Line 2554 
 Description: remove windows look
  -        Object buttonBorder = new SimpleProxyLazyValue(
  -                "com.jgoodies.looks.windows.WindowsLookAndFeel",
  -                "getButtonBorder");
  -
  -        Object menuBorder = isXP
  -            ? WindowsBorders.getXPMenuBorder()
  -            : WindowsBorders.getMenuBorder();
-Line 2568 
 Description: remove windows look
+Line 2578 
 Description: remove windows look
  -        Object textInsets = microLayout.getTextInsets();
  -        Object wrappedTextInsets = microLayout.getWrappedTextInsets();
  -        Insets comboEditorInsets = microLayout.getComboBoxEditorInsets();
  -
  -        int comboBorderSize  = microLayout.getComboBorderSize();
  -        int comboPopupBorderSize = microLayout.getComboPopupBorderSize();
  -        int comboRendererGap = comboEditorInsets.left + comboBorderSize - comboPopupBorderSize;
  -        Object comboRendererBorder = new EmptyBorder(1, comboRendererGap, 1, comboRendererGap);
  -        Object comboTableEditorInsets = new Insets(0, 0, 0, 0);
  -
  -        Object popupMenuSeparatorMargin = microLayout.getPopupMenuSeparatorMargin();
  -
  -        //     Should be active.
-Line 2585 
 Description: remove windows look
+Line 2595 
 Description: remove windows look
  -        Color controlColor = table.getColor("control");
  -        Object disabledTextBackground = table.getColor("TextField.disabledBackground");
  -        Object inactiveTextBackground = table.getColor("TextField.inactiveBackground");
  -
  -        Object comboBoxDisabledBackground = (isVista && isXP)
  -            ? table.getColor("ComboBox.background")
  -            : disabledTextBackground;
  -
  -        Object menuBarBackground = isXP
  -                ? table.get("control")
  -                               : table.get("menu");
  -        Object menuSelectionBackground = isXP
  -                ? table.get("MenuItem.selectionBackground")
-Line 2599 
 Description: remove windows look
+Line 2609 
 Description: remove windows look
  -        Object menuSelectionForeground = isXP
  -                ? table.get("MenuItem.selectionForeground")
  -                : table.get("Menu.foreground");
  -
  -        Character  passwordEchoChar     = new Character(isXP ? '\u25CF' : '*');
  -
  -        Object[] defaults = {
  -            "Button.border",              buttonBorder,
  -                       "Button.margin",              buttonMargin, // Sun's 14px margin is too wide
  -
  -            // 1.4.2 uses a 2 pixel non-standard border that leads to bad
  -            // alignment in the typical case that the border is not painted
  -            "CheckBox.border",            marginBorder,
  -            "CheckBox.margin",            checkBoxMargin,
  -
  -            "ComboBox.disabledBackground", comboBoxDisabledBackground,
  -            "ComboBox.editorBorder",      marginBorder,
  -            "ComboBox.editorColumns",     new Integer(5),
  -            "ComboBox.editorInsets",      comboEditorInsets,   // Added by JGoodies
  -            "ComboBox.tableEditorInsets", comboTableEditorInsets,
  -            "ComboBox.rendererBorder",    comboRendererBorder, // Added by JGoodies
  -
  -            "EditorPane.margin",                 wrappedTextInsets,
  -
  -            // Begin 1.3 und 1.4.0
  -            "Menu.border",                menuBorder, // Fixed in 1.4.1
  -            "Menu.borderPainted",         Boolean.TRUE,
  -                       "Menu.background",            menuBarBackground,
  -                       "Menu.selectionForeground",   menuSelectionForeground,
  -                       "Menu.selectionBackground",   menuSelectionBackground,
  -            // End 1.3 und 1.4.0
  -
  -            "MenuBar.background",         menuBarBackground,
  -                       "MenuBar.border",             menuBarSeparatorBorder, // 1.4.1 Separator wrong
  -            "MenuBar.emptyBorder",        menuBarEmptyBorder, // Added by JGoodies
  -            "MenuBar.separatorBorder",    menuBarSeparatorBorder, // Added by JGoodies
  -            "MenuBar.etchedBorder",       menuBarEtchedBorder, // Added by JGoodies
  -            "MenuBar.headerBorder",       menuBarHeaderBorder, // Added by JGoodies
  -
  -            "FormattedTextField.disabledBackground", disabledTextBackground, // for readonly
  -            "FormattedTextField.inactiveBackground", inactiveTextBackground, // for readonly
  -            "FormattedTextField.margin",  textInsets, // Poor in 1.6
  -
  -            "PasswordField.margin",       textInsets, // Poor in 1.6
  -            "PasswordField.echoChar",     passwordEchoChar,
  -
  -            "PopupMenu.border",           WindowsBorders.getPopupMenuBorder(),
  -            "PopupMenu.noMarginBorder",   WindowsBorders.getNoMarginPopupMenuBorder(),
  -            "PopupMenuSeparator.margin",  popupMenuSeparatorMargin,
  -
  -            "ScrollPane.etchedBorder",    etchedBorder, // Added by JGoodies
  -
  -            "Spinner.defaultEditorInsets", textInsets, // Added by JGoodies
  -
  -            // 1.4.1 uses a 2 pixel non-standard border, that leads to bad
  -            // alignment in the typical case that the border is not painted
  -            "RadioButton.border",         marginBorder,
  -            "RadioButton.margin",         checkBoxMargin,
  -
  -            "Table.gridColor",            controlColor, // 1.4.1 Bug; active
  -            "TextArea.margin",            wrappedTextInsets, // 1.4.1 Bug
  -            "TextArea.disabledBackground", disabledTextBackground,
-Line 2666 
 Description: remove windows look
+Line 2676 
 Description: remove windows look
  -            "ToolBar.separatorBorder",    toolBarSeparatorBorder, // Added by JGoodies
  -            "ToolBar.etchedBorder",       toolBarEtchedBorder, // Added by JGoodies
  -            "ToolBar.headerBorder",       toolBarHeaderBorder, // Added by JGoodies
  -            "ToolBar.separatorSize",      toolBarSeparatorSize,
  -                       "ToolBar.margin",             new InsetsUIResource(0, 10, 0, 0),
  -
  -            "Tree.selectionBorderColor",  controlColor, // 1.4.1 Bug; active
  -            "Tree.rowHeight",             rowHeight, // 1.4.1 Bug
-Line 2678 
 Description: remove windows look
+Line 2688 
 Description: remove windows look
  -            "OptionPane.errorIcon",       isXP ? makeIcon(getClass(), "icons/xp/Error.png")
  -                                               : makeIcon(superclass, "icons/Error.gif"),
  -            "OptionPane.informationIcon", isXP ? makeIcon(getClass(), "icons/xp/Inform.png")
  -                                               : makeIcon(superclass, "icons/Inform.gif"),
  -            "OptionPane.warningIcon",     isXP ? makeIcon(getClass(), "icons/xp/Warn.png")
  -                                               : makeIcon(superclass, "icons/Warn.gif"),
  -            "OptionPane.questionIcon",    isXP ? makeIcon(getClass(), "icons/xp/Inform.png")
  -                                               : makeIcon(superclass, "icons/Question.gif")
  -            });
-Line 2721 
 Description: remove windows look
+Line 2731 
 Description: remove windows look
  -
  -        Object[] defaults = {
  -            "CheckBox.checkColor",    table.get("controlText"), // kind-of black
  -            "CheckBox.icon",          checkBoxIcon,
  -                       "RadioButton.checkColor", table.get("controlText"), // kind-of black
  -            "RadioButton.icon",       radioButtonIcon,
  -            "Table.scrollPaneBorder", winInsetBorder, // 1.4.1 Bug
  -
  -        };
-Line 2748 
 Description: remove windows look
+Line 2758 
 Description: remove windows look
  -        FontSet fontSet = fontChoicePolicy.getFontSet("Windows", table);
  -        initFontDefaults(table, fontSet);
  -    }
  -
  -
  -    private void initMenuItemDefaults(UIDefaults table, MicroLayout microLayout) {
  -        Object menuMargin     = microLayout.getMenuMargin();
  -        Object menuItemMargin = microLayout.getMenuItemMargin();
-Line 2758 
 Description: remove windows look
+Line 2768 
 Description: remove windows look
  -
  -        "Menu.margin",                menuMargin, // 1.4.1 Bug
  -
  -        "MenuItem.borderPainted",     Boolean.TRUE,
  -        "MenuItem.checkIcon",         menuItemCheckIcon, // Aligns menu items
  -        "MenuItem.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
  -        table.putDefaults(defaults);
  -    }
  -
  -
  -    /**
  -        * Sets Fonts in the given FontSet as defaults for all known
  -     * component types in the given UIDefaults table.
  -     *
  -     * @param table       the UIDefaults table used to set fonts
  -     * @param fontSet     describes the set of Fonts to be installed
  -        */
-Line 2782 
 Description: remove windows look
+Line 2792 
 Description: remove windows look
  -        Font toolTipFont = fontSet.getSmallFont();
  -        Font titleFont   = fontSet.getTitleFont();
  -        Font windowFont  = fontSet.getWindowTitleFont();
  -
  -               Object[] defaults = {
  -                               "Button.font",                                                  controlFont,
  -                               "CheckBox.font",                                                controlFont,
-Line 2801 
 Description: remove windows look
+Line 2811 
 Description: remove windows look
  -                               "TabbedPane.font",                                              controlFont,
  -                               "Table.font",                                                   controlFont,
  -                               "TableHeader.font",                                             controlFont,
  -                "TextArea.font",                        controlFont,
  -                               "TextField.font",                                               controlFont,
  -                               "TextPane.font",                                                controlFont,
  -                               "ToolBar.font",                                                 controlFont,
-Line 2830 
 Description: remove windows look
+Line 2840 
 Description: remove windows look
  -        table.putDefaults(defaults);
  -       }
  -
  -
  -    // Getters for Proxy Access (Referred classes can stay package visible) ***
  -
  -    public static Border getButtonBorder() {
-Line 2844 
 Description: remove windows look
+Line 2854 
 Description: remove windows look
  -    public static Icon getRadioButtonIcon() {
  -        return WindowsIconFactory.getRadioButtonIcon();
  -    }
  -
  -
  -    // Helper Code ************************************************************
  -
  -    /**
  -     * Appends the key and value to the given source array and returns
  -     * a copy that has the two new elements at its end.
  -     *
  -     * @return an array with the key and value appended
  -     */
  -    private static Object[] append(Object[] source, String key, Object value) {
-Line 2867 
 Description: remove windows look
+Line 2877 
 Description: remove windows look
  -    /**
  -     * Appends the key and value to the given source array and returns
  -     * a copy that has the two new elements at its end.
  -     *
  -     * @return an array with the key and value appended
  -     */
  -    private static Object[] append(Object[] source, Object[] keysAndValues) {
-Line 2880 
 Description: remove windows look
+Line 2890 
 Description: remove windows look
  -        return destination;
  -    }
  -
  -    // Helper Class ***********************************************************
  -
  -    /**
  -     * This class provides an implementation of <code>LazyValue</code> that
-Line 2900 
 Description: remove windows look
+Line 2910 
 Description: remove windows look
  -        /**
  -         * Creates a <code>LazyValue</code> which will construct an instance
  -         * when asked.
  -         *
  -         * @param c    a <code>String</code> specifying the classname of the class
  -         *                     containing a static method to be called for instance creation
  -         * @param m    a <code>String</code> specifying the static
  -         *             method to be called on class c
  -         */
  -        public SimpleProxyLazyValue(String c, String m) {
-Line 2942 
 Description: remove windows look
+Line 2952 
 Description: remove windows look
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsMenuBarUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsMenuBarUI.java
  +++ /dev/null
  @@ -1,126 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 2990 
 Description: remove windows look
+Line 3000 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows look and feel implemenation of <code>MenuBarUI</code>.<p>
  - *
  - * Can handle optional <code>Border</code> types as specified by the
  - * <code>BorderStyle</code> or <code>HeaderStyle</code> client properties.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -public final class WindowsMenuBarUI extends com.sun.java.swing.plaf.windows.WindowsMenuBarUI {
  -
  -       private PropertyChangeListener listener;
  -
  -
  -       public static ComponentUI createUI(JComponent b) {
  -               return new WindowsMenuBarUI();
  -       }
  -
  -
  -       // Handling Special Borders *********************************************************
  -
  -       protected void installDefaults() {
  -               super.installDefaults();
  -               installSpecialBorder();
  -       }
  -
  -
  -       protected void installListeners() {
  -               super.installListeners();
  -               listener = createBorderStyleListener();
  -               menuBar.addPropertyChangeListener(listener);
  -       }
  -
  -
  -       protected void uninstallListeners() {
  -               menuBar.removePropertyChangeListener(listener);
  -               super.uninstallListeners();
  -       }
  -
  -
  -       private PropertyChangeListener createBorderStyleListener() {
  -               return new PropertyChangeListener() {
  -
  -                       public void propertyChange(PropertyChangeEvent e) {
  -                               String prop = e.getPropertyName();
  -                               if (prop.equals(Options.HEADER_STYLE_KEY) ||
  -                                   prop.equals(WindowsLookAndFeel.BORDER_STYLE_KEY)) {
  -                                  WindowsMenuBarUI.this.installSpecialBorder();
  -                               }
  -                       }
  -
  -               };
  -       }
  -
  -
  -       /**
  -        * Installs a special border, if either a look-dependent
  -        * <code>BorderStyle</code> or a look-independent
  -        * <code>HeaderStyle</code> has been specified.
  -        * A look specific BorderStyle shadows
  -        * a HeaderStyle.<p>
  -        *
  -        * Specifying a HeaderStyle is recommend.
  -        */
  -       private void installSpecialBorder() {
  -               String suffix;
  -               BorderStyle borderStyle = BorderStyle.from(menuBar,
  -                                                                                               WindowsLookAndFeel.BORDER_STYLE_KEY);
  -               if (borderStyle == BorderStyle.EMPTY)
  -                       suffix = "emptyBorder";
-Line 3066 
 Description: remove windows look
+Line 3076 
 Description: remove windows look
  -                       suffix = "headerBorder";
  -               else
  -                       return;
  -
  -               LookAndFeel.installBorder(menuBar, "MenuBar." + suffix);
  -       }
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsMenuItemRenderer.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsMenuItemRenderer.java
  +++ /dev/null
  @@ -1,77 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3120 
 Description: remove windows look
+Line 3130 
 Description: remove windows look
  - * Renders and lays out Windows menu items.
  - * It overrides superclass behavior for the mnemonic check
  - * and the text shadow feature.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.2 $
+ - * @version $Revision: 1.4 $
  - */
  -final class WindowsMenuItemRenderer extends MenuItemRenderer {
  -
-Line 3138 
 Description: remove windows look
+Line 3148 
 Description: remove windows look
  -        super(menuItem, iconBorderEnabled, acceleratorFont, selectionForeground, disabledForeground,
  -                acceleratorForeground, acceleratorSelectionForeground);
  -       }
  -
  -
  -    protected boolean isMnemonicHidden() {
  -        return WindowsLookAndFeel.isMnemonicHidden();
  -    }
  -
  -
  -    protected boolean disabledTextHasShadow() {
  -        return (!LookUtils.IS_LAF_WINDOWS_XP_ENABLED)
  -            || (UIManager.getColor("MenuItem.disabledForeground") == null);
  -    }
  -
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsMenuItemUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsMenuItemUI.java
  +++ /dev/null
  @@ -1,80 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3200 
 Description: remove windows look
+Line 3210 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows look&amp;feel implementation of <code>MenuItemUI</code>.<p>
  - *
  - * It differs from the superclass in that it uses a Windows specific
  - * menu item renderer that checks if mnemonics shall be shown or hidden
  - * and may paint disabled text with a shadow.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.2 $
+ - * @version $Revision: 1.4 $
  - */
  -public final class WindowsMenuItemUI extends ExtBasicMenuItemUI {
  -
-Line 3215 
 Description: remove windows look
+Line 3225 
 Description: remove windows look
  -        return new WindowsMenuItemUI();
  -    }
  -
  -
  -    protected MenuItemRenderer createRenderer(
  -            JMenuItem menuItem,
  -            boolean iconBorderEnabled,
  -            Font    acceleratorFont,
  -            Color   selectionForeground,
-Line 3237 
 Description: remove windows look
+Line 3247 
 Description: remove windows look
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsOptionPaneUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsOptionPaneUI.java
  +++ /dev/null
  @@ -1,68 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3283 
 Description: remove windows look
+Line 3293 
 Description: remove windows look
  -import com.jgoodies.looks.common.ExtButtonAreaLayout;
  -
  -/**
  - * The JGoodies Windows Look&amp;Feel implementation of
  - * <code>OptionPaneUI</code>. Honors the screen resolution and uses a
  - * minimum button with that complies better with the Windows UI style guide.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -public final class WindowsOptionPaneUI extends BasicOptionPaneUI {
  -
-Line 3309 
 Description: remove windows look
+Line 3319 
 Description: remove windows look
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsPasswordFieldUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsPasswordFieldUI.java
  +++ /dev/null
  @@ -1,102 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3357 
 Description: remove windows look
+Line 3367 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows Look&amp;Feel implementation of a password field UI
  - * delegate. It differs from its superclass in that it utilizes a password
  - * view that renders a customizable echo char, not a star (&quot;*&quot;).
  - *
  - * Used for Java 1.4 and Java 5.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -public final class WindowsPasswordFieldUI extends com.sun.java.swing.plaf.windows.WindowsPasswordFieldUI {
  -
  -    /**
  -        * Creates a UI for a {@link JPasswordField}.
  -        *
  -        * @param c the password field component
  -        * @return the UI
  -        */
-Line 3379 
 Description: remove windows look
+Line 3389 
 Description: remove windows look
  -
  -    /*
  -     * We'd like to just set the dot as echo character.
  -     * But the JPasswordField (in Java 1.4 and Java 5)
  -     * installs the UI in a superclass and then sets the echo character.
  -     * The latter would override our call to #setEchoChar.
  -     */
  -//    protected void installDefaults() {
-Line 3388 
 Description: remove windows look
+Line 3398 
 Description: remove windows look
  -//        JPasswordField field = (JPasswordField) getComponent();
  -//        field.setEchoChar('\u25CF');
  -//    }
  -
  -
  -    /**
  -        * Creates and returns a view (an <code>ExtPasswordView</code>) for an element.
  -        *
  -        * @param elem the element
  -        * @return the view
  -        */
-Line 3401 
 Description: remove windows look
+Line 3411 
 Description: remove windows look
  -            ? new ExtPasswordView(elem)
  -            : super.create(elem);
  -    }
  -
  -
  -    /**
  -     * Creates the caret for a field.
  -     *
-Line 3412 
 Description: remove windows look
+Line 3422 
 Description: remove windows look
  -        return new WindowsFieldCaret();
  -    }
  -
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsPopupMenuUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsPopupMenuUI.java
  +++ /dev/null
  @@ -1,110 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3464 
 Description: remove windows look
+Line 3474 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows look&amp;feel implementation of <code>PopMenuUI</code>.
  - * It differs from the superclass in that it provides an option to get a
  - * narrow border. You can set a client property
  - * {@link Options#NO_MARGIN_KEY} to indicate that this popup menu
  - * has a border without margin. That is useful in the special case
  - * where the popup contains only a single component, for example
  - * a JScrollPane.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.4 $
+ - * @version $Revision: 1.6 $
  - *
  - * @see        com.jgoodies.looks.Options#NO_MARGIN_KEY
  - */
  -public final class WindowsPopupMenuUI extends com.sun.java.swing.plaf.windows.WindowsPopupMenuUI {
  -
  -    private PropertyChangeListener borderListener;
  -
  -       public static ComponentUI createUI(JComponent b) {
  -               return new WindowsPopupMenuUI();
  -       }
  -
  -
  -    public void installDefaults() {
  -        super.installDefaults();
  -        installBorder();
-Line 3504 
 Description: remove windows look
+Line 3514 
 Description: remove windows look
  -        popupMenu.removePropertyChangeListener(Options.NO_MARGIN_KEY, borderListener);
  -        super.uninstallListeners();
  -    }
  -
  -    // Narrow Border **********************************************************
  -
  -    private final class BorderStyleChangeHandler implements PropertyChangeListener {
  -
  -        public void propertyChange(PropertyChangeEvent e) {
-Line 3516 
 Description: remove windows look
+Line 3526 
 Description: remove windows look
  -    }
  -
  -    /**
  -     * Installs a border without margin, iff the client property
  -     * <code>Options.NO_MARGIN_KEY</code> is set to <code>Boolean.TRUE</code>.
  -     */
  -    private void installBorder() {
  -        boolean useNarrowBorder = Boolean.TRUE.equals(
-Line 3525 
 Description: remove windows look
+Line 3535 
 Description: remove windows look
  -        String suffix = useNarrowBorder ? "noMarginBorder" : "border";
  -        LookAndFeel.installBorder(popupMenu, "PopupMenu." + suffix);
  -    }
  -
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsScrollBarUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsScrollBarUI.java
  +++ /dev/null
  @@ -1,63 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3572 
 Description: remove windows look
+Line 3582 
 Description: remove windows look
  - * The JGoodies Windows L&amp;F implementation of* <code>ScrollBarUI</code>.
  - * It differs from Sun's Windows Look in that it paints black button triangles
  - * and that it honors the <code>ScrollBar.width</code> property to determine
  - * the preferred size.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -public final class WindowsScrollBarUI extends com.sun.java.swing.plaf.windows.WindowsScrollBarUI {
  -
  -       public static ComponentUI createUI(JComponent b) {
  -               return new WindowsScrollBarUI();
  -       }
-Line 3587 
 Description: remove windows look
+Line 3597 
 Description: remove windows look
  -       protected JButton createDecreaseButton(int orientation) {
  -               return new WindowsArrowButton(orientation);
  -       }
  -
  -
  -       protected JButton createIncreaseButton(int orientation) {
  -               return createDecreaseButton(orientation);
  -       }
  -
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsScrollPaneUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsScrollPaneUI.java
  +++ /dev/null
  @@ -1,99 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3643 
 Description: remove windows look
+Line 3653 
 Description: remove windows look
  -
  -/**
  - * The JGoodies Windows L&amp;F implementation of <code>ScrollPaneUI</code>.
  - * Installs an etched border if the client property
  - * <code>Options.IS_ETCHED_KEY</code> is set.
  - *
  - * @author  Karsten Lentzsch
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - *
  - * @see com.jgoodies.looks.Options#IS_ETCHED_KEY
  - */
  -public final class WindowsScrollPaneUI extends com.sun.java.swing.plaf.windows.WindowsScrollPaneUI {
-Line 3667 
 Description: remove windows look
+Line 3677 
 Description: remove windows look
  -    protected void installEtchedBorder(JScrollPane scrollPane) {
  -        Object value = scrollPane.getClientProperty(Options.IS_ETCHED_KEY);
  -        boolean hasEtchedBorder = Boolean.TRUE.equals(value);
  -        LookAndFeel.installBorder(scrollPane,
  -                hasEtchedBorder
  -                    ? "ScrollPane.etchedBorder"
  -                    : "ScrollPane.border");
  -    }
-Line 3699 
 Description: remove windows look
+Line 3709 
 Description: remove windows look
  -
  -}
  \ No newline at end of file
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsSeparatorUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsSeparatorUI.java
  +++ /dev/null
  @@ -1,57 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3742 
 Description: remove windows look
+Line 3752 
 Description: remove windows look
  -/**
  - * The JGoodies Windows L&amp;F implementation of <code>SeparatorUI</code>.
  - * It differs from its superclass in that it uses a shared UI delegate.
  - *
  - * @author Andrej Golovnin
- - * @version $Revision: 1.3 $
+ - * @version $Revision: 1.5 $
  - */
  -public final class WindowsSeparatorUI extends BasicSeparatorUI {
  -
-Line 3759 
 Description: remove windows look
+Line 3769 
 Description: remove windows look
  -    }
  -
  -}
- --- libjgoodies-looks-java.orig/src/core/com/jgoodies/looks/windows/WindowsSpinnerUI.java
+ --- a/src/core/com/jgoodies/looks/windows/WindowsSpinnerUI.java
  +++ /dev/null
  @@ -1,209 +0,0 @@
  -/*
- - * Copyright (c) 2001-2007 JGoodies Karsten Lentzsch. All Rights Reserved.
+ - * Copyright (c) 2001-2008 JGoodies Karsten Lentzsch. All Rights Reserved.
  - *
  - * Redistribution and use in source and binary forms, with or without
  - * modification, are permitted provided that the following conditions are met:
  - *
  - *  o Redistributions of source code must retain the above copyright notice,
  - *    this list of conditions and the following disclaimer.
  - *
  - *  o Redistributions in binary form must reproduce the above copyright notice,
  - *    this list of conditions and the following disclaimer in the documentation
  - *    and/or other materials provided with the distribution.
  - *
  - *  o Neither the name of JGoodies Karsten Lentzsch nor the names of
  - *    its contributors may be used to endorse or promote products derived
  - *    from this software without specific prior written permission.
  - *
  - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
  - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
  - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  - * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
  - * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
  - * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  - */
  -
  -package com.jgoodies.looks.windows;
-Line 3810 
 Description: remove windows look
+Line 3820 
 Description: remove windows look
  - * The JGoodies Windows L&amp;F implementation of <code>SpinnerUI</code>.
  - * Configures the default editor to adjust font baselines and component
  - * bounds, by setting an empty border with the default text insets.
  - *
  - * @author Karsten Lentzsch
- - * @version $Revision: 1.4 $
+ - * @version $Revision: 1.6 $
  - */
  -public final class WindowsSpinnerUI extends com.sun.java.swing.plaf.windows.WindowsSpinnerUI {
  -
-Line 3824 
 Description: remove windows look
+Line 3834 
 Description: remove windows look
  -    /**
  -     * The mouse/action listeners that are added to the spinner's arrow
  -     * buttons. These listeners are shared by all spinner arrow buttons.
  -     *
  -     * @see #createNextButton
  -     * @see #createPreviousButton
  -     */
  -    private static final ExtBasicArrowButtonHandler NEXT_BUTTON_HANDLER =
  -        new ExtBasicArrowButtonHandler("increment", true);
  -    private static final ExtBasicArrowButtonHandler PREVIOUS_BUTTON_HANDLER =
  -        new ExtBasicArrowButtonHandler("decrement", false);
  -
  -
-Line 3841 
 Description: remove windows look
+Line 3851 
 Description: remove windows look
  -     * updates it's <code>JSpinner</code> ancestors model. If a
  -     * previousButton isn't needed (in a subclass) then override this method to
  -     * return null.
  -     *
  -     * @return a component that will replace the spinners model with the next
  -     *         value in the sequence, or null