Tue, 05 May 2015 13:18:54 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Apr 27 15:02:49 2015 -0700 1.2 +++ b/.hgtags Tue May 05 13:18:54 2015 -0700 1.3 @@ -398,6 +398,7 @@ 1.4 3f6c3f48179ac8bab98509be8708edcea32727b6 jdk8u45-b12 1.5 15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13 1.6 bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14 1.7 +cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15 1.8 8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31 1.9 1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32 1.10 74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00 1.11 @@ -411,6 +412,7 @@ 1.12 cbba234a2b481b236e2bf78c892111b86f6bba81 jdk8u51-b08 1.13 9116c6bb2ffa6bb624ad39f7a98b7b9bed4512dc jdk8u51-b09 1.14 783b917616ab6977f9b3157667d1493636ba66d1 jdk8u51-b10 1.15 +5a69995912aae8bd61758e95a3b5edac167b6acc jdk8u51-b11 1.16 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06 1.17 45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07 1.18 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00
2.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Mon Apr 27 15:02:49 2015 -0700 2.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Tue May 05 13:18:54 2015 -0700 2.3 @@ -30,7 +30,12 @@ 2.4 import com.sun.source.util.Trees; 2.5 import com.sun.xml.internal.bind.v2.model.nav.Navigator; 2.6 import com.sun.xml.internal.bind.v2.runtime.Location; 2.7 - 2.8 +import java.lang.annotation.Annotation; 2.9 +import java.util.ArrayList; 2.10 +import java.util.Collection; 2.11 +import java.util.HashMap; 2.12 +import java.util.List; 2.13 +import java.util.Map; 2.14 import javax.annotation.processing.ProcessingEnvironment; 2.15 import javax.lang.model.element.AnnotationMirror; 2.16 import javax.lang.model.element.Element; 2.17 @@ -52,12 +57,6 @@ 2.18 import javax.lang.model.util.Elements; 2.19 import javax.lang.model.util.SimpleTypeVisitor6; 2.20 import javax.lang.model.util.Types; 2.21 -import java.lang.annotation.Annotation; 2.22 -import java.util.Collection; 2.23 -import java.util.HashMap; 2.24 -import java.util.HashSet; 2.25 -import java.util.List; 2.26 -import java.util.Map; 2.27 2.28 /** 2.29 * {@link Navigator} implementation for annotation processing. 2.30 @@ -241,7 +240,7 @@ 2.31 2.32 public VariableElement[] getEnumConstants(TypeElement clazz) { 2.33 List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz); 2.34 - Collection<VariableElement> constants = new HashSet<VariableElement>(); 2.35 + Collection<VariableElement> constants = new ArrayList<VariableElement>(); 2.36 for (Element element : elements) { 2.37 if (element.getKind().equals(ElementKind.ENUM_CONSTANT)) { 2.38 constants.add((VariableElement) element);