diff options
Diffstat (limited to 'src')
3 files changed, 15 insertions, 10 deletions
diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java index cd4619ad..f1f675e2 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/SchemaGenerator.java @@ -30,6 +30,7 @@ import com.sun.tools.internal.xjc.BadCommandLineException; import com.sun.xml.internal.bind.util.Which; import javax.lang.model.SourceVersion; +import javax.tools.Diagnostic; import javax.tools.DiagnosticCollector; import javax.tools.JavaCompiler; import javax.tools.JavaFileObject; @@ -239,7 +240,12 @@ public class SchemaGenerator { if (episode != null) r.setEpisodeFile(episode); task.setProcessors(Collections.singleton(r)); - return task.call(); + boolean res = task.call(); + //Print messages generated by compiler + for (Diagnostic<? extends JavaFileObject> d : diagnostics.getDiagnostics()) { + System.err.println(d.toString()); + } + return res; } } diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java index 4f84ade7..0f7843e0 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/ap/SchemaGenerator.java @@ -135,7 +135,7 @@ public class SchemaGenerator extends AbstractProcessor { private void filterClass(List<Reference> classes, Collection<? extends Element> elements) { for (Element element : elements) { - if (element.getKind().equals(ElementKind.CLASS)) { + if (element.getKind().equals(ElementKind.CLASS) || element.getKind().equals(ElementKind.ENUM)) { classes.add(new Reference((TypeElement) element, processingEnv)); filterClass(classes, ElementFilter.typesIn(element.getEnclosedElements())); } diff --git a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java index 803d3297..dcdaae3a 100644 --- a/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java +++ b/src/share/jaxws_classes/com/sun/tools/internal/jxc/model/nav/ApNavigator.java @@ -30,7 +30,12 @@ import com.sun.source.util.TreePath; 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.ElementFilter; 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 final class ApNavigator implements Navigator<TypeMirror, TypeElement, Var 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); |