< prev index next >

src/jdk.xml.bind/share/classes/com/sun/tools/internal/xjc/addon/episode/PluginImpl.java

Print this page

        

*** 1,7 **** /* ! * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this --- 1,7 ---- /* ! * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License version 2 only, as * published by the Free Software Foundation. Oracle designates this
*** 23,50 **** * questions. */ package com.sun.tools.internal.xjc.addon.episode; - import java.io.File; - import java.io.FileOutputStream; - import java.io.IOException; - import java.io.OutputStream; - import java.util.ArrayList; - import java.util.HashMap; - import java.util.HashSet; - import java.util.List; - import java.util.Map; - import java.util.Set; - import com.sun.tools.internal.xjc.BadCommandLineException; import com.sun.tools.internal.xjc.Options; import com.sun.tools.internal.xjc.Plugin; import com.sun.tools.internal.xjc.outline.ClassOutline; - import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.outline.EnumOutline; import com.sun.tools.internal.xjc.reader.Const; import com.sun.xml.internal.txw2.TXW; import com.sun.xml.internal.txw2.output.StreamSerializer; import com.sun.xml.internal.xsom.XSAnnotation; import com.sun.xml.internal.xsom.XSAttGroupDecl; import com.sun.xml.internal.xsom.XSAttributeDecl; --- 23,41 ---- * questions. */ package com.sun.tools.internal.xjc.addon.episode; import com.sun.tools.internal.xjc.BadCommandLineException; import com.sun.tools.internal.xjc.Options; import com.sun.tools.internal.xjc.Plugin; import com.sun.tools.internal.xjc.outline.ClassOutline; import com.sun.tools.internal.xjc.outline.EnumOutline; + import com.sun.tools.internal.xjc.outline.Outline; import com.sun.tools.internal.xjc.reader.Const; + import com.sun.xml.internal.bind.v2.schemagen.episode.Bindings; + import com.sun.xml.internal.bind.v2.schemagen.episode.SchemaBindings; import com.sun.xml.internal.txw2.TXW; import com.sun.xml.internal.txw2.output.StreamSerializer; import com.sun.xml.internal.xsom.XSAnnotation; import com.sun.xml.internal.xsom.XSAttGroupDecl; import com.sun.xml.internal.xsom.XSAttributeDecl;
*** 63,79 **** import com.sun.xml.internal.xsom.XSSchema; import com.sun.xml.internal.xsom.XSSimpleType; import com.sun.xml.internal.xsom.XSWildcard; import com.sun.xml.internal.xsom.XSXPath; import com.sun.xml.internal.xsom.visitor.XSFunction; - import com.sun.xml.internal.bind.v2.schemagen.episode.Bindings; - import com.sun.xml.internal.bind.v2.schemagen.episode.SchemaBindings; - import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /** * Creates the episode file, * * @author Kohsuke Kawaguchi * @author Ben Tomasini (ben.tomasini@gmail.com) --- 54,78 ---- import com.sun.xml.internal.xsom.XSSchema; import com.sun.xml.internal.xsom.XSSimpleType; import com.sun.xml.internal.xsom.XSWildcard; import com.sun.xml.internal.xsom.XSXPath; import com.sun.xml.internal.xsom.visitor.XSFunction; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; + import java.io.File; + import java.io.FileOutputStream; + import java.io.IOException; + import java.io.OutputStream; + import java.util.ArrayList; + import java.util.HashSet; + import java.util.LinkedHashMap; + import java.util.List; + import java.util.Map; + import java.util.Set; + /** * Creates the episode file, * * @author Kohsuke Kawaguchi * @author Ben Tomasini (ben.tomasini@gmail.com)
*** 104,114 **** */ public boolean run(Outline model, Options opt, ErrorHandler errorHandler) throws SAXException { try { // reorganize qualifying components by their namespaces to // generate the list nicely ! Map<XSSchema, PerSchemaOutlineAdaptors> perSchema = new HashMap<XSSchema,PerSchemaOutlineAdaptors>(); boolean hasComponentInNoNamespace = false; // Combine classes and enums into a single list List<OutlineAdaptor> outlines = new ArrayList<OutlineAdaptor>(); --- 103,113 ---- */ public boolean run(Outline model, Options opt, ErrorHandler errorHandler) throws SAXException { try { // reorganize qualifying components by their namespaces to // generate the list nicely ! Map<XSSchema, PerSchemaOutlineAdaptors> perSchema = new LinkedHashMap<XSSchema, PerSchemaOutlineAdaptors>(); boolean hasComponentInNoNamespace = false; // Combine classes and enums into a single list List<OutlineAdaptor> outlines = new ArrayList<OutlineAdaptor>();
*** 170,181 **** group._namespace(tns,"tns"); group.scd("x-schema::"+(tns.equals("")?"":"tns")); SchemaBindings schemaBindings = group.schemaBindings(); schemaBindings.map(false); ! if (ps.packageNames.size() == 1) ! { final String packageName = ps.packageNames.iterator().next(); if (packageName != null && packageName.length() > 0) { schemaBindings._package().name(packageName); } } --- 169,179 ---- group._namespace(tns,"tns"); group.scd("x-schema::"+(tns.equals("")?"":"tns")); SchemaBindings schemaBindings = group.schemaBindings(); schemaBindings.map(false); ! if (ps.packageNames.size() == 1) { final String packageName = ps.packageNames.iterator().next(); if (packageName != null && packageName.length() > 0) { schemaBindings._package().name(packageName); } }
*** 283,293 **** private enum OutlineType { CLASS(new BindingsBuilder() { public void build(OutlineAdaptor adaptor, Bindings bindings) { bindings.klass().ref(adaptor.implName); - } }), ENUM(new BindingsBuilder() { public void build(OutlineAdaptor adaptor, Bindings bindings) { bindings.typesafeEnumClass().ref(adaptor.implName); --- 281,290 ----
*** 302,312 **** private interface BindingsBuilder { void build(OutlineAdaptor adaptor, Bindings bindings); } ! }; private final XSComponent schemaComponent; private final OutlineType outlineType; private final String implName; private final String packageName; --- 299,309 ---- private interface BindingsBuilder { void build(OutlineAdaptor adaptor, Bindings bindings); } ! } private final XSComponent schemaComponent; private final OutlineType outlineType; private final String implName; private final String packageName;
*** 329,340 **** private final List<OutlineAdaptor> outlineAdaptors = new ArrayList<OutlineAdaptor>(); private final Set<String> packageNames = new HashSet<String>(); ! private void add(OutlineAdaptor outlineAdaptor) ! { this.outlineAdaptors.add(outlineAdaptor); this.packageNames.add(outlineAdaptor.packageName); } } --- 326,336 ---- private final List<OutlineAdaptor> outlineAdaptors = new ArrayList<OutlineAdaptor>(); private final Set<String> packageNames = new HashSet<String>(); ! private void add(OutlineAdaptor outlineAdaptor) { this.outlineAdaptors.add(outlineAdaptor); this.packageNames.add(outlineAdaptor.packageName); } }
< prev index next >