# HG changeset patch # User andrew # Date 1390000936 0 # Node ID a5ed9b7f47d326b8ba0d8b3a91a7988430b8e6dd # Parent 3fbf2a364eed6b58f9894a74d3d5fb9ac3635d5d OPENJDK6-25: Remove @Override annotation added on interfaces by 2014/01/14 security fixes Summary: Code is built with source/target 1.5 so can't use @Override on interfaces Reviewed-by: omajid diff -r 3fbf2a364eed -r a5ed9b7f47d3 drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java --- a/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java Wed Oct 16 10:23:23 2013 -0400 +++ b/drop_included/jaxws_src/src/com/sun/tools/internal/jxc/model/nav/APTNavigator.java Fri Jan 17 23:22:16 2014 +0000 @@ -272,7 +272,6 @@ return clazz.getPackage().getQualifiedName(); } - @Override public TypeDeclaration loadObjectFactory(TypeDeclaration referencePoint, String packageName) { return env.getTypeDeclaration(packageName + ".ObjectFactory"); } diff -r 3fbf2a364eed -r a5ed9b7f47d3 drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java --- a/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Wed Oct 16 10:23:23 2013 -0400 +++ b/drop_included/jaxws_src/src/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Fri Jan 17 23:22:16 2014 +0000 @@ -299,7 +299,6 @@ throw new UnsupportedOperationException(); } - @Override public NClass loadObjectFactory(NClass referencePoint, String pkg) { throw new UnsupportedOperationException(); } diff -r 3fbf2a364eed -r a5ed9b7f47d3 drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java --- a/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java Wed Oct 16 10:23:23 2013 -0400 +++ b/drop_included/jaxws_src/src/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java Fri Jan 17 23:22:16 2014 +0000 @@ -507,7 +507,6 @@ else return name.substring(0,idx); } - @Override public Class loadObjectFactory(Class referencePoint, String pkg) { String clName = pkg + ".ObjectFactory"; checkPackageAccess(clName);