Mercurial > hg > openjdk > aarch64-port > jaxws

changeset 866:797b756b9e02

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge up to jdk8u60-b21
author enevill
date Tue, 30 Jun 2015 16:17:26 +0100
parents 8c4a2f136a99 (current diff) a414aec2d19c (diff)
children 8a9908111cef
files .hgtags
diffstat 2 files changed, 29 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Apr 16 11:36:46 2015 +0100
+++ b/.hgtags	Tue Jun 30 16:17:26 2015 +0100
@@ -403,3 +403,25 @@
 855fd9dfcbee177b508413dbab6e46b57dd367c4 jdk8u45-b11
 3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12
 15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13
+bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14
+c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00
+7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01
+5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02
+3e52068e8b9df8a9bb7a0594fab7f4132817ac3d jdk8u60-b03
+02b1d3c68132b14a36e5d1df9b4a53c7981469b4 jdk8u60-b04
+4dfd5dbd3014db59f92d54cf215f7e7ed4508044 jdk8u60-b05
+a22a9460d53fb519b00e118c98ee0cb5e981b659 jdk8u60-b06
+6f0885023e43fe44cade86e3dd77350d9ecbc4b4 jdk8u60-b07
+078fde829e878595fcd9122a52ea5cfafe6685a8 jdk8u60-b08
+fbb7b2d1321fdb7345e163bbc8c01a307f9d9d38 jdk8u60-b09
+3e7a28ca602befafcd6329a60c00e5b36c4e69c6 jdk8u60-b10
+334320b978e06d309d9a9ec67097f982128fad91 jdk8u60-b11
+fab06c192b0b246656e47aacab2fb555e3ca2cb7 jdk8u60-b12
+4390fe716719a6966e10bf9cce4b8752f9cf5d96 jdk8u60-b13
+feb70717506da80f712f0b942d77527d2cc4cde5 jdk8u60-b14
+8c0018c9c533126cf3f7e912936f6e227bd1e96c jdk8u60-b15
+1c9eb173022b4b95ef6c93685b62b3039ccf8d92 jdk8u60-b16
+d6a80a0a3e9aca2b40f80709c9ce6c471b8902cf jdk8u60-b17
+53361b1cead8fc5ab1619a0b3baec8d4b411319d jdk8u60-b18
+5b422975b71def8c5a16a4f303c8fb8b108dc0cf jdk8u60-b19
+1a4b2888aa98ea70aad849e35e05b48e1c107503 jdk8u60-b20
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java	Thu Apr 16 11:36:46 2015 +0100
+++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java	Tue Jun 30 16:17:26 2015 +0100
@@ -30,7 +30,12 @@
 import com.sun.source.util.Trees;
 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 java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import javax.annotation.processing.ProcessingEnvironment;
 import javax.lang.model.element.AnnotationMirror;
 import javax.lang.model.element.Element;
@@ -52,12 +57,6 @@
 import javax.lang.model.util.Elements;
 import javax.lang.model.util.SimpleTypeVisitor6;
 import javax.lang.model.util.Types;
-import java.lang.annotation.Annotation;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
 
 /**
  * {@link Navigator} implementation for annotation processing.
@@ -241,7 +240,7 @@
 
     public VariableElement[] getEnumConstants(TypeElement clazz) {
         List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz);
-        Collection<VariableElement> constants = new HashSet<VariableElement>();
+        Collection<VariableElement> constants = new ArrayList<VariableElement>();
         for (Element element : elements) {
             if (element.getKind().equals(ElementKind.ENUM_CONSTANT)) {
                 constants.add((VariableElement) element);