Merge jdk8-b84

Mon, 01 Apr 2013 21:35:19 -0700

author
lana
date
Mon, 01 Apr 2013 21:35:19 -0700
changeset 365
5773e3fc8380
parent 362
54c29eb352e7
parent 364
2476e1f2afa5
child 366
8c0b6bccfe47

Merge

     1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java	Thu Mar 28 10:54:47 2013 -0700
     1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java	Mon Apr 01 21:35:19 2013 -0700
     1.3 @@ -1,5 +1,5 @@
     1.4  /*
     1.5 - * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
     1.6 + * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
     1.7   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     1.8   *
     1.9   * This code is free software; you can redistribute it and/or modify it
    1.10 @@ -31,7 +31,9 @@
    1.11  import com.sun.xml.internal.bind.v2.model.nav.Navigator;
    1.12  import com.sun.xml.internal.bind.v2.runtime.Location;
    1.13  
    1.14 +import java.lang.annotation.Annotation;
    1.15  import javax.annotation.processing.ProcessingEnvironment;
    1.16 +import javax.lang.model.element.AnnotationMirror;
    1.17  import javax.lang.model.element.Element;
    1.18  import javax.lang.model.element.ElementKind;
    1.19  import javax.lang.model.element.ExecutableElement;
    1.20 @@ -372,6 +374,21 @@
    1.21          public TypeKind getKind() {
    1.22              throw new IllegalStateException();
    1.23          }
    1.24 +
    1.25 +        @Override
    1.26 +        public List<? extends AnnotationMirror> getAnnotationMirrors() {
    1.27 +            throw new IllegalStateException();
    1.28 +        }
    1.29 +
    1.30 +        @Override
    1.31 +        public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
    1.32 +            throw new IllegalStateException();
    1.33 +        }
    1.34 +
    1.35 +        @Override
    1.36 +        public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
    1.37 +            throw new IllegalStateException();
    1.38 +        }
    1.39      };
    1.40  
    1.41      public Location getClassLocation(TypeElement typeElement) {

mercurial