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

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java	Thu Apr 04 19:05:24 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/xjc/reader/xmlschema/SimpleTypeBuilder.java	Tue Apr 09 14:51:13 2013 +0100
     1.3 @@ -39,9 +39,11 @@
     1.4  import java.util.Stack;
     1.5  
     1.6  import javax.activation.MimeTypeParseException;
     1.7 +import javax.xml.bind.DatatypeConverter;
     1.8  
     1.9  import com.sun.codemodel.internal.JJavaName;
    1.10  import com.sun.codemodel.internal.util.JavadocEscapeWriter;
    1.11 +import com.sun.xml.internal.bind.v2.WellKnownNamespace;
    1.12  import com.sun.tools.internal.xjc.ErrorReceiver;
    1.13  import com.sun.tools.internal.xjc.model.CBuiltinLeafInfo;
    1.14  import com.sun.tools.internal.xjc.model.CClassInfo;
    1.15 @@ -62,10 +64,10 @@
    1.16  import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.BindInfo;
    1.17  import com.sun.tools.internal.xjc.reader.xmlschema.bindinfo.EnumMemberMode;
    1.18  import com.sun.tools.internal.xjc.util.MimeTypeRange;
    1.19 -import com.sun.xml.internal.bind.DatatypeConverterImpl;
    1.20 -import com.sun.xml.internal.bind.v2.WellKnownNamespace;
    1.21 +
    1.22  import static com.sun.xml.internal.bind.v2.WellKnownNamespace.XML_MIME_URI;
    1.23 -import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapter;
    1.24 +
    1.25 +import com.sun.xml.internal.bind.v2.runtime.SwaRefAdapterMarker;
    1.26  import com.sun.xml.internal.xsom.XSAttributeDecl;
    1.27  import com.sun.xml.internal.xsom.XSComplexType;
    1.28  import com.sun.xml.internal.xsom.XSComponent;
    1.29 @@ -393,7 +395,7 @@
    1.30          if(type.getTargetNamespace().equals(WellKnownNamespace.SWA_URI)) {
    1.31              String name = type.getName();
    1.32              if(name!=null && name.equals("swaRef"))
    1.33 -                return CBuiltinLeafInfo.STRING.makeAdapted(SwaRefAdapter.class,false);
    1.34 +                return CBuiltinLeafInfo.STRING.makeAdapted(SwaRefAdapterMarker.class,false);
    1.35          }
    1.36  
    1.37  
    1.38 @@ -668,7 +670,7 @@
    1.39  
    1.40                  if (mem!=null) {
    1.41                      name = mem.name;
    1.42 -                    if (mdoc != null) {
    1.43 +                    if (mdoc == null) {
    1.44                          mdoc = mem.javadoc;
    1.45                      }
    1.46                  }
    1.47 @@ -846,7 +848,7 @@
    1.48          XSFacet me = initiatingType.getFacet(facetName);
    1.49          if(me==null)
    1.50              return null;
    1.51 -        BigInteger bi = DatatypeConverterImpl._parseInteger(me.getValue().value);
    1.52 +        BigInteger bi = DatatypeConverter.parseInteger(me.getValue().value);
    1.53          if(offset!=0)
    1.54              bi = bi.add(BigInteger.valueOf(offset));
    1.55          return bi;