Merge
diff --git a/jaxws/.hgtags b/jaxws/.hgtags
index e02bdee..7bfa0eb 100644
--- a/jaxws/.hgtags
+++ b/jaxws/.hgtags
@@ -204,3 +204,4 @@
b0224010e2f0c2474055ac592c8d3f37b9264690 jdk8-b80
c88bb21560ccf1a9e6d2a2ba08ed2045a002676f jdk8-b81
d8d8032d02d77fbf5f9b3bb8df73663f42fd4dd0 jdk8-b82
+a1dcc0d83da1e07f3ada60ef110dd105d95d3554 jdk8-b83
diff --git a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
index ff450c9..da1cf80 100644
--- a/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
+++ b/jaxws/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@@ -31,7 +31,9 @@
import com.sun.xml.internal.bind.v2.model.nav.Navigator;
import com.sun.xml.internal.bind.v2.runtime.Location;
+import java.lang.annotation.Annotation;
import javax.annotation.processing.ProcessingEnvironment;
+import javax.lang.model.element.AnnotationMirror;
import javax.lang.model.element.Element;
import javax.lang.model.element.ElementKind;
import javax.lang.model.element.ExecutableElement;
@@ -372,6 +374,21 @@
public TypeKind getKind() {
throw new IllegalStateException();
}
+
+ @Override
+ public List<? extends AnnotationMirror> getAnnotationMirrors() {
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public <A extends Annotation> A getAnnotation(Class<A> annotationType) {
+ throw new IllegalStateException();
+ }
+
+ @Override
+ public <A extends Annotation> A[] getAnnotationsByType(Class<A> annotationType) {
+ throw new IllegalStateException();
+ }
};
public Location getClassLocation(TypeElement typeElement) {