/hg/release/icedtea7-forest-2.3/jaxws: 2 new changesets
omajid at icedtea.classpath.org
omajid at icedtea.classpath.org
Tue Jan 14 13:06:27 PST 2014
changeset 94f02a325b7f in /hg/release/icedtea7-forest-2.3/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=94f02a325b7f
author: mkos
date: Wed Oct 16 10:23:23 2013 -0400
8010935: Better XML handling
Reviewed-by: mchung, mgrebac, mullan
changeset 9801349b6b81 in /hg/release/icedtea7-forest-2.3/jaxws
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.3/jaxws?cmd=changeset;node=9801349b6b81
author: mullan
date: Thu Oct 17 17:37:46 2013 -0400
8026826: JDK 7 fix for 8010935 broke the build
Reviewed-by: prr
diffstat:
src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java | 10 +-
src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java | 5 +-
src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java | 12 +-
src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java | 9 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java | 11 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java | 10 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java | 11 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/Navigator.java | 10 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/nav/ReflectionNavigator.java | 62 +++++-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/runtime/RuntimeTypeInfoSet.java | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/ElementBeanInfoImpl.java | 7 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java | 11 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/ArrayProperty.java | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/SingleMapNodeProperty.java | 6 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/property/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Accessor.java | 5 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Lister.java | 9 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/TransducedAccessor.java | 6 +-
src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/reflect/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/model/RuntimeModeler.java | 13 +-
src/share/jaxws_classes/com/sun/xml/internal/ws/model/Utils.java | 85 ++++++++++
src/share/jaxws_classes/com/sun/xml/internal/ws/model/WrapperBeanGenerator.java | 4 +-
29 files changed, 702 insertions(+), 119 deletions(-)
diffs (truncated from 1461 to 500 lines):
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/APTNavigator.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -71,8 +71,7 @@
*
* @author Kohsuke Kawaguchi (kk at kohsuke.org)
*/
-public class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldDeclaration,MethodDeclaration> {
-
+public final class APTNavigator implements Navigator<TypeMirror,TypeDeclaration,FieldDeclaration,MethodDeclaration> {
private final AnnotationProcessorEnvironment env;
private final PrimitiveType primitiveByte;
@@ -277,8 +276,9 @@
return clazz.getPackage().getQualifiedName();
}
- public TypeDeclaration findClass(String className, TypeDeclaration referencePoint) {
- return env.getTypeDeclaration(className);
+ @Override
+ public TypeDeclaration loadObjectFactory(TypeDeclaration referencePoint, String packageName) {
+ return env.getTypeDeclaration(packageName + ".ObjectFactory");
}
public boolean isBridgeMethod(MethodDeclaration method) {
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/EagerNType.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -30,7 +30,6 @@
import com.sun.codemodel.internal.JType;
import com.sun.tools.internal.xjc.outline.Aspect;
import com.sun.tools.internal.xjc.outline.Outline;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
/**
* @author Kohsuke Kawaguchi
@@ -69,6 +68,6 @@
}
public String fullName() {
- return Navigator.REFLECTION.getTypeName(t);
+ return Utils.REFLECTION_NAVIGATOR.getTypeName(t);
}
}
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java
--- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/NavigatorImpl.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -56,7 +56,7 @@
EagerNType ent = (EagerNType) nt;
if (base instanceof EagerNClass) {
EagerNClass enc = (EagerNClass) base;
- return create(REFLECTION.getBaseClass(ent.t, enc.c));
+ return create(Utils.REFLECTION_NAVIGATOR.getBaseClass(ent.t, enc.c));
}
// lazy class can never be a base type of an eager type
return null;
@@ -176,7 +176,7 @@
public NType getTypeArgument(NType nt, int i) {
if (nt instanceof EagerNType) {
EagerNType ent = (EagerNType) nt;
- return create(REFLECTION.getTypeArgument(ent.t,i));
+ return create(Utils.REFLECTION_NAVIGATOR.getTypeArgument(ent.t,i));
}
if (nt instanceof NClassByJClass) {
NClassByJClass nnt = (NClassByJClass) nt;
@@ -189,7 +189,7 @@
public boolean isParameterizedType(NType nt) {
if (nt instanceof EagerNType) {
EagerNType ent = (EagerNType) nt;
- return REFLECTION.isParameterizedType(ent.t);
+ return Utils.REFLECTION_NAVIGATOR.isParameterizedType(ent.t);
}
if (nt instanceof NClassByJClass) {
NClassByJClass nnt = (NClassByJClass) nt;
@@ -303,8 +303,8 @@
throw new UnsupportedOperationException();
}
- public NClass findClass(String className, NClass referencePoint) {
- // TODO: implement this method later
+ @Override
+ public NClass loadObjectFactory(NClass referencePoint, String pkg) {
throw new UnsupportedOperationException();
}
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/model/nav/Utils.java Thu Oct 17 17:37:46 2013 -0400
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.tools.internal.xjc.model.nav;
+
+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utils class.
+ *
+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+/* package */ final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ Class refNav = null;
+ try {
+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+ Method getInstance = refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+ throw e;
+ }
+ }
+
+ /**
+ * private constructor to avoid util class instantiating
+ */
+ private Utils() {
+ }
+}
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/api/JAXBRIContext.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,6 @@
import com.sun.xml.internal.bind.api.impl.NameConverter;
import com.sun.xml.internal.bind.v2.ContextFactory;
import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
/**
@@ -404,7 +403,7 @@
* @since 2.0 FCS
*/
public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) {
- return Navigator.REFLECTION.getBaseClass(type,baseType);
+ return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType);
}
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/api/TypeReference.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,8 +31,6 @@
import javax.xml.namespace.QName;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-
/**
* A reference to a JAXB-bound type.
*
@@ -104,11 +102,10 @@
// if we are to reinstitute this check, check JAXB annotations only
// assert annotations.length==0; // not designed to work with adapters.
- Type base = Navigator.REFLECTION.getBaseClass(type, Collection.class);
+ Type base = Utils.REFLECTION_NAVIGATOR.getBaseClass(type, Collection.class);
if(base==null)
return this; // not a collection
- return new TypeReference(tagName,
- Navigator.REFLECTION.getTypeArgument(base,0));
+ return new TypeReference(tagName, Utils.REFLECTION_NAVIGATOR.getTypeArgument(base,0));
}
}
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/api/Utils.java Thu Oct 17 17:37:46 2013 -0400
@@ -0,0 +1,85 @@
+/*
+ * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+package com.sun.xml.internal.bind.api;
+
+import com.sun.xml.internal.bind.v2.model.nav.Navigator;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+/**
+ * Utils class.
+ *
+ * WARNING: If you are doing any changes don't forget to change other Utils classes in different packages.
+ *
+ * Has *package private* access to avoid inappropriate usage.
+ */
+/* package */ final class Utils {
+
+ private static final Logger LOGGER = Logger.getLogger(Utils.class.getName());
+
+ /**
+ * static ReflectionNavigator field to avoid usage of reflection every time we use it.
+ */
+ /* package */ static final Navigator<Type, Class, Field, Method> REFLECTION_NAVIGATOR;
+
+ static { // we statically initializing REFLECTION_NAVIGATOR property
+ Class refNav = null;
+ try {
+ refNav = Class.forName("com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator");
+ //noinspection unchecked
+ Method getInstance = refNav.getDeclaredMethod("getInstance");
+ getInstance.setAccessible(true);
+ //noinspection unchecked
+ REFLECTION_NAVIGATOR = (Navigator<Type, Class, Field, Method>) getInstance.invoke(null);
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("Can't find ReflectionNavigator class");
+ } catch (InvocationTargetException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance throws the exception");
+ } catch (NoSuchMethodException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance can't be found");
+ } catch (IllegalAccessException e) {
+ e.printStackTrace();
+ throw new IllegalStateException("ReflectionNavigator.getInstance method is inaccessible");
+ } catch (SecurityException e) {
+ LOGGER.log(Level.FINE, "Unable to access ReflectionNavigator.getInstance", e);
+ throw e;
+ }
+ }
+
+ /**
+ * private constructor to avoid util class instantiating
+ */
+ private Utils() {
+ }
+}
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ModelBuilder.java Thu Oct 17 17:37:46 2013 -0400
@@ -235,7 +235,7 @@
String pkg = nav.getPackageName(ci.getClazz());
if(!registries.containsKey(pkg)) {
// insert the package's object factory
- C c = loadObjectFactory(ci, pkg);
+ C c = nav.loadObjectFactory(clazz, pkg);
if(c!=null)
addRegistry(c,(Locatable)p);
}
@@ -264,15 +264,6 @@
return r;
}
- private C loadObjectFactory(ClassInfoImpl<T, C, F, M> ci, String pkg) {
- try {
- return nav.findClass(pkg + ".ObjectFactory", ci.getClazz());
- } catch (SecurityException ignored) {
- // treat SecurityException in same way as ClassNotFoundException in this case
- return null;
- }
- }
-
/**
* Checks the uniqueness of the type name.
*/
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeAnyTypeImpl.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
import java.lang.reflect.Type;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
import com.sun.xml.internal.bind.v2.runtime.Transducer;
@@ -36,7 +35,7 @@
*/
final class RuntimeAnyTypeImpl extends AnyTypeImpl<Type,Class> implements RuntimeNonElement {
private RuntimeAnyTypeImpl() {
- super(Navigator.REFLECTION);
+ super(Utils.REFLECTION_NAVIGATOR);
}
public <V> Transducer<V> getTransducer() {
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeElementInfoImpl.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -42,7 +42,6 @@
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeRef;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
import com.sun.xml.internal.bind.v2.runtime.Transducer;
import com.sun.xml.internal.bind.v2.runtime.reflect.Accessor;
@@ -122,7 +121,7 @@
}
public Class<? extends JAXBElement> getType() {
- return Navigator.REFLECTION.erasure(super.getType());
+ return (Class<? extends JAXBElement>) Utils.REFLECTION_NAVIGATOR.erasure(super.getType());
}
public RuntimeClassInfo getScope() {
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeModelBuilder.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -37,8 +37,6 @@
import com.sun.xml.internal.bind.v2.model.annotation.Locatable;
import com.sun.xml.internal.bind.v2.model.annotation.RuntimeAnnotationReader;
import com.sun.xml.internal.bind.v2.model.core.ID;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElementRef;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimePropertyInfo;
@@ -75,7 +73,7 @@
public final @Nullable JAXBContextImpl context;
public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map<Class, Class> subclassReplacements, String defaultNamespaceRemap) {
- super(annotationReader, Navigator.REFLECTION, subclassReplacements, defaultNamespaceRemap);
+ super(annotationReader, Utils.REFLECTION_NAVIGATOR, subclassReplacements, defaultNamespaceRemap);
this.context = context;
}
@@ -109,10 +107,6 @@
return new RuntimeArrayInfoImpl(this, upstream, (Class)arrayType);
}
- public ReflectionNavigator getNavigator() {
- return (ReflectionNavigator)nav;
- }
-
@Override
protected RuntimeTypeInfoSetImpl createTypeInfoSet() {
return new RuntimeTypeInfoSetImpl(reader);
diff -r bb0717b2e410 -r 9801349b6b81 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java
--- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java Thu Aug 01 15:41:32 2013 -0400
+++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/RuntimeTypeInfoSetImpl.java Thu Oct 17 17:37:46 2013 -0400
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -34,9 +34,6 @@
import com.sun.xml.internal.bind.v2.model.annotation.AnnotationReader;
import com.sun.xml.internal.bind.v2.model.core.TypeInfoSet;
-import com.sun.xml.internal.bind.v2.model.core.NonElement;
-import com.sun.xml.internal.bind.v2.model.nav.Navigator;
-import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeNonElement;
import com.sun.xml.internal.bind.v2.model.runtime.RuntimeTypeInfoSet;
@@ -47,7 +44,7 @@
*/
final class RuntimeTypeInfoSetImpl extends TypeInfoSetImpl<Type,Class,Field,Method> implements RuntimeTypeInfoSet {
public RuntimeTypeInfoSetImpl(AnnotationReader<Type,Class,Field,Method> reader) {
- super(Navigator.REFLECTION,reader,RuntimeBuiltinLeafInfoImpl.LEAVES);
+ super(Utils.REFLECTION_NAVIGATOR,reader,RuntimeBuiltinLeafInfoImpl.LEAVES);
}
@Override
@@ -55,10 +52,6 @@
return RuntimeAnyTypeImpl.theInstance;
}
- public ReflectionNavigator getNavigator() {
- return (ReflectionNavigator)super.getNavigator();
More information about the distro-pkg-dev
mailing list