Backporting changeset from 7 to 6 for bugfix

[Joe Darcy]

Joe Darcy wrote:
> Joe Darcy wrote:
>> Andrew John Hughes wrote:
>>> On 10 June 2010 22:17, Joe Darcy <joe.darcy at oracle.com> wrote:
>>>  
>
> [...]
>>>
>>> Ok.  I used the Oracle copyright on those files introduced in the
>>> patches above, rather than the original.
>>>
>>>   
>>
>> Sounds good.
>>
>> However, I'm unforunately not seeing these changes in the repository 
>> yet; was there an issue with your push?
>>
>> -Joe
>>
>
> Okay; the changes have come through now.
>
> -Joe

Hmm, I'm getting a build error in Nimbus when doing a fresh build from 
tip; was there a merge issue?

../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:86: 
cannot find symbol
symbol  : class NimbusDefaults
location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel
    private NimbusDefaults defaults;
            ^
../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:100: 
cannot find symbol
symbol  : class NimbusDefaults
location: class com.sun.java.swing.plaf.nimbus.NimbusLookAndFeel
        defaults = new NimbusDefaults();
                       ^
../../../src/share/classes/com/sun/java/swing/plaf/nimbus/NimbusLookAndFeel.java:154: 
package NimbusDefaults does not exist
                    new NimbusDefaults.DerivedFont("defaultFont",
                                      ^
Note: Some input files use or override a deprecated API.
Note: Recompile with -Xlint:deprecation for details.
Note: Some input files use unchecked or unsafe operations.
Note: Recompile with -Xlint:unchecked for details.
3 errors
make[3]: *** [.compile.classlist] Error 1
make[3]: Leaving directory 
`/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax/swing'
make[2]: *** [build] Error 1
make[2]: Leaving directory 
`/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make/javax'
make[1]: *** [all] Error 1
make[1]: Leaving directory `/home/darcy/Sun/OpenJDK/6/hg/jdk6/jdk/make'
make: *** [jdk-build] Error 2

-Joe