Backporting changeset from 7 to 6 for bugfix

[Andrew John Hughes]

On 12 June 2010 01:24, Joe Darcy <joe.darcy at oracle.com> wrote:
> Andrew John Hughes wrote:
>>
>> On 12 June 2010 00:04, Joe Darcy <joe.darcy at oracle.com> wrote:
>>
>>>
>>> Andrew John Hughes wrote:
>>>
>>>>
>>>> On 11 June 2010 23:38, Joe Darcy <joe.darcy at oracle.com> wrote:
>>>>
>>>>
>>>>>
>>>>> Andrew John Hughes wrote:
>>>>>
>>>>>
>>>>>>
>>>>>> On 11 June 2010 23:07, Andrew John Hughes <ahughes at redhat.com> wrote:
>>>>>>
>>>>>>
>>>>>>
>>>>>>>
>>>>>>> On 11 June 2010 21:04, Joe Darcy <joe.darcy at oracle.com> wrote:
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>>
>>>>>>>> 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
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>>
>>>>>>>
>>>>>>> I'm seeing this error now too, after deleting the previous build
>>>>>>> (fresh from the first Nimbus patch).  NimbusDefaults is a generated
>>>>>>> file, as I see it in the tl build:
>>>>>>>
>>>>>>> /mnt/builder/tl/gensrc/javax/swing/plaf/nimbus/NimbusDefaults.java
>>>>>>>
>>>>>>> but not jdk6.  None of the patches seem to add a reference to it
>>>>>>> though, so this may be something latent that has been activated by
>>>>>>> these updates.  I'll keep looking.
>>>>>>> --
>>>>>>> Andrew :-)
>>>>>>>
>>>>>>> Free Java Software Engineer
>>>>>>> Red Hat, Inc. (http://www.redhat.com)
>>>>>>>
>>>>>>> Support Free Java!
>>>>>>> Contribute to GNU Classpath and the OpenJDK
>>>>>>> http://www.gnu.org/software/classpath
>>>>>>> http://openjdk.java.net
>>>>>>>
>>>>>>> PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
>>>>>>> Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>>
>>>>>>
>>>>>> It's an ordering issue.  javax.swing is being built first, but needs
>>>>>> NimbusLookAndFeel due to the workaround for 6827653.  Looking into a
>>>>>> fix.
>>>>>>
>>>>>>
>>>>>>
>>>>>
>>>>> Sounds good; I've filed 6960808 "OpenJDK 6 Nimbus build failure" for
>>>>> the
>>>>> eventual fix.
>>>>>
>>>>> -Joe
>>>>>
>>>>>
>>>>>
>>>>
>>>> Here's a webrev for the fix:
>>>>
>>>> http://cr.openjdk.java.net/~andrew/6960808/
>>>>
>>>> Running the Nimbus generator is moving up a level from
>>>> make/javax/swing/plaf to make/javax/swing, so that it occurs before
>>>> building any javax.swing classes.
>>>>
>>>> Ok to push?
>>>>
>>>>
>>>
>>> Approved to be pushed.
>>>
>>> -Joe
>>>
>>>
>>
>> Done.
>>
>
> Build completes fine now :-)
>
> Thanks,
>
> -Joe
>


I found another issue; the Nimbus code uses the @Override annotation
on interfaces but the code is compiled with source & target 5, not 6.
 javac lets this through for source & target 5 (which seems wrong for
a feature introduced in 1.6), but ecj doesn't.

http://cr.openjdk.java.net/~andrew/nimbus/webrev.07/

raises the source & target to 6 for javax.swing and javax.swing.plaf,
and is now necessary to build (the previous backport broke
DISABLE_NIMBUS due to SynthLookAndFeel depending on
NimbusLookAndFeel).  I made the change locally so as not to disrupt
the build too much, but we could change the jdk-wide setting instead
(this is done in two places for some reason;
common/shared/Defs-java.gmk and Defs-control.gmk).

Thoughts?
-- 
Andrew :-)

Free Java Software Engineer
Red Hat, Inc. (http://www.redhat.com)

Support Free Java!
Contribute to GNU Classpath and the OpenJDK
http://www.gnu.org/software/classpath
http://openjdk.java.net

PGP Key: 94EFD9D8 (http://subkeys.pgp.net)
Fingerprint: F8EF F1EA 401E 2E60 15FA  7927 142C 2591 94EF D9D8