src/share/jaxws_classes/com/sun/xml/internal/bind/v2/model/impl/ArrayInfoImpl.java

*** 25,39 ****
  
  package com.sun.xml.internal.bind.v2.model.impl;
  
  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.runtime.Location;
  import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException;
  
  /**
   *
--- 25,38 ----
  
  package com.sun.xml.internal.bind.v2.model.impl;
  
  import javax.xml.namespace.QName;
  
  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;
  
  /**
   *
*** 66,89 ****
          if(n==null) {
              builder.reportError(new IllegalAnnotationException(Messages.ANONYMOUS_ARRAY_ITEM.format(
                  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");
      }
  
      public NonElement<TypeT, ClassDeclT> getItemType() {
          return itemType;
      }
--- 65,75 ----
          if(n==null) {
              builder.reportError(new IllegalAnnotationException(Messages.ANONYMOUS_ARRAY_ITEM.format(
                  nav().getTypeName(componentType)),this));
              n = new QName("#dummy"); // for error recovery
          }
!         this.typeName = ArrayInfoUtil.calcArrayTypeName(n);
      }
  
      public NonElement<TypeT, ClassDeclT> getItemType() {
          return itemType;
      }