Mercurial > hg > openjdk > aarch64-port > jaxws
changeset 913:5a69995912aa jdk8u51-b11
Merge
author | asaha |
---|---|
date | Thu, 30 Apr 2015 23:06:57 -0700 |
parents | 31a95002c5cc (diff) 1a0139074296 (current diff) |
children | 1a855f69de64 |
files | .hgtags |
diffstat | 2 files changed, 23 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Apr 30 00:59:06 2015 -0700 +++ b/.hgtags Thu Apr 30 23:06:57 2015 -0700 @@ -352,6 +352,7 @@ 9d0c737694ece23547c0a27dcd0ba6cbcdf577f2 jdk8u31-b13 49e91817cbe1b14f856c26f6e55b7151e3f8c3a8 jdk8u31-b31 9e20c5acb448c5f9b05a4e9b4efc222b3b616c23 jdk8u31-b32 +ea23d583e36301301612946d34ff6aa90d795dd9 jdk8u31-b33 31d43d250c836c13fcc87025837783788c5cd0de jdk8u40-b00 262fb5353ffa661f88b4a9cf2581fcad8c2a43f7 jdk8u40-b01 8043f77ef8a4ded9505269a356c4e2f4f9604cd9 jdk8u40-b02 @@ -380,6 +381,8 @@ b6120aaf2aeef7c5608d578e15e82db7eb24fb2e jdk8u40-b25 1bcb30bdd9883cc7fc1bf70800ea03a4429eaa80 jdk8u40-b26 a5f2cdedb940511674e153dce8d3cbc3a0598c9e jdk8u40-b27 +a342e6841e8d3bbef44d4158c980be2ab903e10a jdk8u40-b31 +8960bce00f1abecad665291b0077d6e673c0ff64 jdk8u40-b32 667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00 cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01 855a7b9302053546e4da94b67cc3b8956f5b4985 jdk8u45-b02 @@ -396,3 +399,16 @@ 15fb2359f5f86dbacc1bc120f663853b5292cd14 jdk8u45-b13 bad02ac45d59b5096032cf42bb880dcddffa84b4 jdk8u45-b14 cc7d796b8f12cc11d415f8ae0ef2d952274fc069 jdk8u45-b15 +8a7494ab96913de396a8f38dd324ac52c44b1a80 jdk8u45-b31 +1c022144b99b859336914740e571c672e51ee1b9 jdk8u45-b32 +74aae7549ef8c6e9f394b75c840bf293e2664858 jdk8u51-b00 +78d8cafb17e46dd2453704f679ca1e431e4df0ba jdk8u51-b01 +9bd6f57d97e5423d5f25774b095124cbe1eeb9c1 jdk8u51-b02 +a9ed1bcefec1ee0d30ea8cf700cf0813d8588eb0 jdk8u51-b03 +3d07c26d5012f47ef274043a6204db686769d65d jdk8u51-b04 +834da1120e80f17356475a5d3f06a678355dbbf6 jdk8u51-b05 +243ba3774d18cfe2e56fa0e0474255787c360d07 jdk8u51-b06 +13d1721eae3bdea08dcd7b84e0856e6769caafc9 jdk8u51-b07 +cbba234a2b481b236e2bf78c892111b86f6bba81 jdk8u51-b08 +9116c6bb2ffa6bb624ad39f7a98b7b9bed4512dc jdk8u51-b09 +783b917616ab6977f9b3157667d1493636ba66d1 jdk8u51-b10
--- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Thu Apr 30 00:59:06 2015 -0700 +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java Thu Apr 30 23:06:57 2015 -0700 @@ -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);