Wed, 29 Apr 2015 14:05:23 -0700
Merge
1.1 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Wed Apr 29 12:16:40 2015 -0700 1.2 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Wed Apr 29 14:05:23 2015 -0700 1.3 @@ -30,7 +30,12 @@ 1.4 import com.sun.source.util.Trees; 1.5 import com.sun.xml.internal.bind.v2.model.nav.Navigator; 1.6 import com.sun.xml.internal.bind.v2.runtime.Location; 1.7 - 1.8 +import java.lang.annotation.Annotation; 1.9 +import java.util.ArrayList; 1.10 +import java.util.Collection; 1.11 +import java.util.HashMap; 1.12 +import java.util.List; 1.13 +import java.util.Map; 1.14 import javax.annotation.processing.ProcessingEnvironment; 1.15 import javax.lang.model.element.AnnotationMirror; 1.16 import javax.lang.model.element.Element; 1.17 @@ -52,12 +57,6 @@ 1.18 import javax.lang.model.util.Elements; 1.19 import javax.lang.model.util.SimpleTypeVisitor6; 1.20 import javax.lang.model.util.Types; 1.21 -import java.lang.annotation.Annotation; 1.22 -import java.util.Collection; 1.23 -import java.util.HashMap; 1.24 -import java.util.HashSet; 1.25 -import java.util.List; 1.26 -import java.util.Map; 1.27 1.28 /** 1.29 * {@link Navigator} implementation for annotation processing. 1.30 @@ -241,7 +240,7 @@ 1.31 1.32 public VariableElement[] getEnumConstants(TypeElement clazz) { 1.33 List<? extends Element> elements = env.getElementUtils().getAllMembers(clazz); 1.34 - Collection<VariableElement> constants = new HashSet<VariableElement>(); 1.35 + Collection<VariableElement> constants = new ArrayList<VariableElement>(); 1.36 for (Element element : elements) { 1.37 if (element.getKind().equals(ElementKind.ENUM_CONSTANT)) { 1.38 constants.add((VariableElement) element);