1.1 --- a/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java Thu Apr 04 19:05:24 2013 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java Tue Apr 09 14:51:13 2013 +0100 1.3 @@ -27,11 +27,10 @@ 1.4 1.5 import javax.xml.namespace.QName; 1.6 1.7 -import com.sun.xml.internal.bind.v2.TODO; 1.8 -import com.sun.xml.internal.bind.v2.WellKnownNamespace; 1.9 import com.sun.xml.internal.bind.v2.model.annotation.Locatable; 1.10 import com.sun.xml.internal.bind.v2.model.core.ArrayInfo; 1.11 import com.sun.xml.internal.bind.v2.model.core.NonElement; 1.12 +import com.sun.xml.internal.bind.v2.model.util.ArrayInfoUtil; 1.13 import com.sun.xml.internal.bind.v2.runtime.Location; 1.14 import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException; 1.15 1.16 @@ -68,20 +67,7 @@ 1.17 nav().getTypeName(componentType)),this)); 1.18 n = new QName("#dummy"); // for error recovery 1.19 } 1.20 - this.typeName = calcArrayTypeName(n); 1.21 - } 1.22 - 1.23 - /** 1.24 - * Computes the type name of the array from that of the item type. 1.25 - */ 1.26 - public static QName calcArrayTypeName(QName n) { 1.27 - String uri; 1.28 - if(n.getNamespaceURI().equals(WellKnownNamespace.XML_SCHEMA)) { 1.29 - TODO.checkSpec("this URI"); 1.30 - uri = "http://jaxb.dev.java.net/array"; 1.31 - } else 1.32 - uri = n.getNamespaceURI(); 1.33 - return new QName(uri,n.getLocalPart()+"Array"); 1.34 + this.typeName = ArrayInfoUtil.calcArrayTypeName(n); 1.35 } 1.36 1.37 public NonElement<TypeT, ClassDeclT> getItemType() {