SUGGESTED FIX
# HG changeset patch
# User andrew
# Date 1276694000 -3600
# Node ID 6ef1ef04bf30fd4c771be6b416905397ae0468ef
# Parent 38d41e1f149338e3ecd009e95f8f6dc30196bc6a
6961536: Nimbus code using @Override breaks build with source/target 1.5
Summary: @Override on annotations is only allowed with source 1.6
Reviewed-by: darcy
--- a/make/javax/swing/Makefile Tue Jun 15 16:42:54 2010 +0800
+++ b/make/javax/swing/Makefile Wed Jun 16 14:13:20 2010 +0100
@@ -35,6 +35,8 @@ NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR
NIMBUS_GENERATOR_JAR = $(BUILDTOOLJARDIR)/generatenimbus.jar
include $(BUILDDIR)/common/Defs.gmk
+LANGUAGE_VERSION = -source 6
+CLASS_VERSION = -target 6
#
# Files
--- a/make/javax/swing/plaf/Makefile Tue Jun 15 16:42:54 2010 +0800
+++ b/make/javax/swing/plaf/Makefile Wed Jun 16 14:13:20 2010 +0100
@@ -29,6 +29,8 @@ SWING_SRC = $(SHARE_SRC)/classes/javax/s
SWING_SRC = $(SHARE_SRC)/classes/javax/swing
include $(BUILDDIR)/common/Defs.gmk
+LANGUAGE_VERSION = -source 6
+CLASS_VERSION = -target 6
#
# Files
|