Fri, 22 Nov 2013 21:11:19 +0100
8010935: Better XML handling
8027378: Two closed/javax/xml/8005432 fails with jdk7u51b04
8028382: Two javax/xml/8005433 tests still fail after the fix JDK-8028147
Summary: base fix + fixes for test regressions; fix also reviewed by Maxim Soloviev, Alexander Fomin
Reviewed-by: mchung, mgrebac, mullan
ohair@286 | 1 | /* |
ohair@286 | 2 | * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved. |
ohair@286 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
ohair@286 | 4 | * |
ohair@286 | 5 | * This code is free software; you can redistribute it and/or modify it |
ohair@286 | 6 | * under the terms of the GNU General Public License version 2 only, as |
ohair@286 | 7 | * published by the Free Software Foundation. Oracle designates this |
ohair@286 | 8 | * particular file as subject to the "Classpath" exception as provided |
ohair@286 | 9 | * by Oracle in the LICENSE file that accompanied this code. |
ohair@286 | 10 | * |
ohair@286 | 11 | * This code is distributed in the hope that it will be useful, but WITHOUT |
ohair@286 | 12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
ohair@286 | 13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
ohair@286 | 14 | * version 2 for more details (a copy is included in the LICENSE file that |
ohair@286 | 15 | * accompanied this code). |
ohair@286 | 16 | * |
ohair@286 | 17 | * You should have received a copy of the GNU General Public License version |
ohair@286 | 18 | * 2 along with this work; if not, write to the Free Software Foundation, |
ohair@286 | 19 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
ohair@286 | 20 | * |
ohair@286 | 21 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
ohair@286 | 22 | * or visit www.oracle.com if you need additional information or have any |
ohair@286 | 23 | * questions. |
ohair@286 | 24 | */ |
ohair@286 | 25 | |
ohair@286 | 26 | package com.sun.xml.internal.bind.v2.model.impl; |
ohair@286 | 27 | |
ohair@286 | 28 | import javax.xml.namespace.QName; |
ohair@286 | 29 | |
ohair@286 | 30 | import com.sun.xml.internal.bind.v2.model.annotation.Locatable; |
ohair@286 | 31 | import com.sun.xml.internal.bind.v2.model.core.ArrayInfo; |
ohair@286 | 32 | import com.sun.xml.internal.bind.v2.model.core.NonElement; |
alanb@368 | 33 | import com.sun.xml.internal.bind.v2.model.util.ArrayInfoUtil; |
ohair@286 | 34 | import com.sun.xml.internal.bind.v2.runtime.Location; |
ohair@286 | 35 | import com.sun.xml.internal.bind.v2.runtime.IllegalAnnotationException; |
ohair@286 | 36 | |
ohair@286 | 37 | /** |
ohair@286 | 38 | * |
ohair@286 | 39 | * <p> |
ohair@286 | 40 | * Public because XJC needs to access it |
ohair@286 | 41 | * |
ohair@286 | 42 | * @author Kohsuke Kawaguchi |
ohair@286 | 43 | */ |
ohair@286 | 44 | public class ArrayInfoImpl<TypeT,ClassDeclT,FieldT,MethodT> |
ohair@286 | 45 | extends TypeInfoImpl<TypeT,ClassDeclT,FieldT,MethodT> |
ohair@286 | 46 | implements ArrayInfo<TypeT,ClassDeclT>, Location { |
ohair@286 | 47 | |
ohair@286 | 48 | private final NonElement<TypeT,ClassDeclT> itemType; |
ohair@286 | 49 | |
ohair@286 | 50 | private final QName typeName; |
ohair@286 | 51 | |
ohair@286 | 52 | /** |
ohair@286 | 53 | * The representation of T[] in the underlying reflection library. |
ohair@286 | 54 | */ |
ohair@286 | 55 | private final TypeT arrayType; |
ohair@286 | 56 | |
ohair@286 | 57 | public ArrayInfoImpl(ModelBuilder<TypeT,ClassDeclT,FieldT,MethodT> builder, |
ohair@286 | 58 | Locatable upstream, TypeT arrayType) { |
ohair@286 | 59 | super(builder, upstream); |
ohair@286 | 60 | this.arrayType = arrayType; |
ohair@286 | 61 | TypeT componentType = nav().getComponentType(arrayType); |
ohair@286 | 62 | this.itemType = builder.getTypeInfo(componentType, this); |
ohair@286 | 63 | |
ohair@286 | 64 | QName n = itemType.getTypeName(); |
ohair@286 | 65 | if(n==null) { |
ohair@286 | 66 | builder.reportError(new IllegalAnnotationException(Messages.ANONYMOUS_ARRAY_ITEM.format( |
ohair@286 | 67 | nav().getTypeName(componentType)),this)); |
ohair@286 | 68 | n = new QName("#dummy"); // for error recovery |
ohair@286 | 69 | } |
alanb@368 | 70 | this.typeName = ArrayInfoUtil.calcArrayTypeName(n); |
ohair@286 | 71 | } |
ohair@286 | 72 | |
ohair@286 | 73 | public NonElement<TypeT, ClassDeclT> getItemType() { |
ohair@286 | 74 | return itemType; |
ohair@286 | 75 | } |
ohair@286 | 76 | |
ohair@286 | 77 | public QName getTypeName() { |
ohair@286 | 78 | return typeName; |
ohair@286 | 79 | } |
ohair@286 | 80 | |
ohair@286 | 81 | public boolean isSimpleType() { |
ohair@286 | 82 | return false; |
ohair@286 | 83 | } |
ohair@286 | 84 | |
ohair@286 | 85 | public TypeT getType() { |
ohair@286 | 86 | return arrayType; |
ohair@286 | 87 | } |
ohair@286 | 88 | |
ohair@286 | 89 | /** |
ohair@286 | 90 | * Leaf-type cannot be referenced from IDREF. |
ohair@286 | 91 | * |
ohair@286 | 92 | * @deprecated |
ohair@286 | 93 | * why are you calling a method whose return value is always known? |
ohair@286 | 94 | */ |
ohair@286 | 95 | public final boolean canBeReferencedByIDREF() { |
ohair@286 | 96 | return false; |
ohair@286 | 97 | } |
ohair@286 | 98 | |
ohair@286 | 99 | public Location getLocation() { |
ohair@286 | 100 | return this; |
ohair@286 | 101 | } |
ohair@286 | 102 | public String toString() { |
ohair@286 | 103 | return nav().getTypeName(arrayType); |
ohair@286 | 104 | } |
ohair@286 | 105 | } |