diff -r 8c0b6bccfe47 -r 0989ad8c0860 src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java Thu Apr 04 19:05:24 2013 -0700 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java Tue Apr 09 14:51:13 2013 +0100 @@ -27,11 +27,10 @@ import javax.xml.namespace.QName; -import com.sun.xml.internal.bind.v2.TODO; -import com.sun.xml.internal.bind.v2.WellKnownNamespace; import com.sun.xml.internal.bind.v2.model.annotation.Locatable; import com.sun.xml.internal.bind.v2.model.core.ArrayInfo; import com.sun.xml.internal.bind.v2.model.core.NonElement; +import com.sun.xml.internal.bind.v2.model.util.ArrayInfoUtil; import com.sun.xml.internal.bind.v2.runtime.Location; import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException; @@ -68,20 +67,7 @@ nav().getTypeName(componentType)),this)); n = new QName("#dummy"); // for error recovery } - this.typeName = calcArrayTypeName(n); - } - - /** - * Computes the type name of the array from that of the item type. - */ - public static QName calcArrayTypeName(QName n) { - String uri; - if(n.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA)) { - TODO.checkSpec("this URI"); - uri = "http://jaxb.dev.java.net/array"; - } else - uri = n.getNamespaceURI(); - return new QName(uri,n.getLocalPart()+"Array"); + this.typeName = ArrayInfoUtil.calcArrayTypeName(n); } public NonElement getItemType() {