Mercurial > jdk8-mips64-public > jaxws / file diff

     1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Thu Oct 31 12:36:20 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/runtime/JAXBContextImpl.java	Fri Nov 22 21:11:19 2013 +0100
     1.3 @@ -65,7 +65,6 @@
     1.4  import javax.xml.transform.Transformer;
     1.5  import javax.xml.transform.TransformerConfigurationException;
     1.6  import javax.xml.transform.TransformerFactory;
     1.7 -import javax.xml.transform.sax.SAXResult;
     1.8  import javax.xml.transform.sax.SAXTransformerFactory;
     1.9  import javax.xml.transform.sax.TransformerHandler;
    1.10  
    1.11 @@ -90,7 +89,6 @@
    1.12  import com.sun.xml.internal.bind.v2.model.impl.RuntimeBuiltinLeafInfoImpl;
    1.13  import com.sun.xml.internal.bind.v2.model.impl.RuntimeModelBuilder;
    1.14  import com.sun.xml.internal.bind.v2.model.nav.Navigator;
    1.15 -import com.sun.xml.internal.bind.v2.model.nav.ReflectionNavigator;
    1.16  import com.sun.xml.internal.bind.v2.model.runtime.RuntimeArrayInfo;
    1.17  import com.sun.xml.internal.bind.v2.model.runtime.RuntimeBuiltinLeafInfo;
    1.18  import com.sun.xml.internal.bind.v2.model.runtime.RuntimeClassInfo;
    1.19 @@ -118,7 +116,6 @@
    1.20  import org.w3c.dom.Node;
    1.21  import org.xml.sax.SAXException;
    1.22  import org.xml.sax.SAXParseException;
    1.23 -import org.xml.sax.helpers.DefaultHandler;
    1.24  
    1.25  /**
    1.26   * This class provides the implementation of JAXBContext.
    1.27 @@ -363,7 +360,7 @@
    1.28              beanInfoMap.put( e.getKey(), beanInfoMap.get(e.getValue()) );
    1.29  
    1.30          // build bridges
    1.31 -        ReflectionNavigator nav = typeSet.getNavigator();
    1.32 +        Navigator<Type, Class, Field, Method> nav = typeSet.getNavigator();
    1.33  
    1.34          for (TypeReference tr : typeRefs) {
    1.35              XmlJavaTypeAdapter xjta = tr.get(XmlJavaTypeAdapter.class);
    1.36 @@ -371,7 +368,7 @@
    1.37              XmlList xl = tr.get(XmlList.class);
    1.38  
    1.39              // eventually compute the in-memory type
    1.40 -            Class erasedType = nav.erasure(tr.type);
    1.41 +            Class erasedType = (Class) nav.erasure(tr.type);
    1.42  
    1.43              if(xjta!=null) {
    1.44                  a = new Adapter<Type,Class>(xjta.value(),nav);
    1.45 @@ -382,7 +379,7 @@
    1.46              }
    1.47  
    1.48              if(a!=null) {
    1.49 -                erasedType = nav.erasure(a.defaultType);
    1.50 +                erasedType = (Class) nav.erasure(a.defaultType);
    1.51              }
    1.52  
    1.53              Name name = nameBuilder.createElementName(tr.tagName);
    1.54 @@ -877,7 +874,7 @@
    1.55                  // this is a special class we introduced for JAX-WS that we *don't* want in the schema
    1.56              } else {
    1.57                  NonElement<Type,Class> typeInfo = getXmlType(tis,tr);
    1.58 -                xsdgen.add(tr.tagName, !Navigator.REFLECTION.isPrimitive(tr.type),typeInfo);
    1.59 +                xsdgen.add(tr.tagName, !tis.getNavigator().isPrimitive(tr.type),typeInfo);
    1.60              }
    1.61          }
    1.62          return xsdgen;