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

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java	Thu Sep 26 10:43:28 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/ct/AbstractExtendedComplexTypeBuilder.java	Fri Oct 04 16:21:34 2013 +0100
     1.3 @@ -41,6 +41,7 @@
     1.4  import com.sun.xml.internal.xsom.XSType;
     1.5  import com.sun.xml.internal.xsom.XSWildcard;
     1.6  import com.sun.xml.internal.xsom.visitor.XSTermFunction;
     1.7 +import javax.xml.namespace.QName;
     1.8  
     1.9  import com.sun.xml.internal.rngom.nc.ChoiceNameClass;
    1.10  import com.sun.xml.internal.rngom.nc.NameClass;
    1.11 @@ -65,14 +66,17 @@
    1.12       * Computes a name class that represents everything in a given content model.
    1.13       */
    1.14      protected final XSTermFunction<NameClass> contentModelNameClassBuilder = new XSTermFunction<NameClass>() {
    1.15 +        @Override
    1.16          public NameClass wildcard(XSWildcard wc) {
    1.17              return WildcardNameClassBuilder.build(wc);
    1.18          }
    1.19  
    1.20 +        @Override
    1.21          public NameClass modelGroupDecl(XSModelGroupDecl decl) {
    1.22              return modelGroup(decl.getModelGroup());
    1.23          }
    1.24  
    1.25 +        @Override
    1.26          public NameClass modelGroup(XSModelGroup group) {
    1.27              NameClass nc = NameClass.NULL;
    1.28              for( int i=0; i<group.getSize(); i++ )
    1.29 @@ -216,7 +220,7 @@
    1.30       * Gets a {@link SimpleNameClass} from the name of a {@link XSDeclaration}.
    1.31       */
    1.32      private NameClass getNameClass(XSDeclaration decl) {
    1.33 -        return new SimpleNameClass(decl.getTargetNamespace(), decl.getName());
    1.34 +        return new SimpleNameClass(new QName(decl.getTargetNamespace(), decl.getName()));
    1.35      }
    1.36  
    1.37  }