Author: jsdelfino
Date: Fri Apr 14 18:52:17 2006
New Revision: 394241
URL: http://svn.apache.org/viewcvs?rev=394241&view=rev
Log:
Fix for TUSCANY-194, applied Dan's patch to remove warnings and reformat the
source
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java?rev=394241&r1=394240&r2=394241&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/JavaInterfaceGenerator.java
Fri Apr 14 18:52:17 2006
@@ -49,19 +49,22 @@
private List codegenExtensions = new ArrayList();
private CodeGenConfiguration codegenConfiguration;
- public JavaInterfaceGenerator(String uri, String outputLocation, String
packageName, Map<QName, String> typeMapping) throws CodeGenerationException {
+ public JavaInterfaceGenerator(String uri, String outputLocation, String
packageName,
+ Map<QName, String> typeMapping) throws
CodeGenerationException {
WSDLDescription wom;
try {
- wom =
WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1).build(uri).getDescription();
+ wom =
WOMBuilderFactory.getBuilder(org.apache.wsdl.WSDLConstants.WSDL_1_1)
+ .build(uri).getDescription();
} catch (WSDLException e) {
throw new
CodeGenerationException(CodegenMessages.getMessage("engine.wsdlParsingException"),
e);
}
-
- if (packageName==null)
-
packageName=XMLNameUtil.getPackageNameFromNamespace(wom.getTargetNameSpace());
-
- JavaTypeMapper typeMapper=new JavaTypeMapper();
- for (Map.Entry<QName, String> e : typeMapping.entrySet() ) {
+
+ if (packageName == null) {
+ packageName =
XMLNameUtil.getPackageNameFromNamespace(wom.getTargetNameSpace());
+ }
+
+ JavaTypeMapper typeMapper = new JavaTypeMapper();
+ for (Map.Entry<QName, String> e : typeMapping.entrySet()) {
typeMapper.addTypeMappingName(e.getKey(), e.getValue());
}
@@ -84,23 +87,23 @@
codegenConfiguration.setTypeMapper(typeMapper);
codegenConfiguration.setWriteMessageReceiver(false);
codegenConfiguration.setWriteTestCase(false);
-
+
addExtension(new WSDLValidatorExtension());
addExtension(new PackageFinder());
addExtension(new SDODataBindingCodegenExtension(typeMapper));
addExtension(new DefaultDatabindingExtension());
}
+ @SuppressWarnings("unchecked")
private void addExtension(CodeGenExtension ext) {
ext.init(codegenConfiguration);
codegenExtensions.add(ext);
}
-
public void generate() throws CodeGenerationException {
try {
for (int i = 0; i < codegenExtensions.size(); i++) {
- ((CodeGenExtension) codegenExtensions.get(i)).engage();
+ ((CodeGenExtension)codegenExtensions.get(i)).engage();
}
class JavaInterfaceEmitter extends JavaEmitter {
@@ -110,24 +113,25 @@
if (!configuration.getOutputLocation().exists()) {
configuration.getOutputLocation().mkdirs();
}
- InterfaceWriter interfaceWriter =
- new
InterfaceWriter(this.configuration.getOutputLocation(),
- this.configuration.getOutputLanguage());
+ InterfaceWriter interfaceWriter = new
InterfaceWriter(this.configuration
+ .getOutputLocation(),
this.configuration.getOutputLanguage());
String packageName =
interfaceModel.getDocumentElement().getAttribute("package");
String className =
interfaceModel.getDocumentElement().getAttribute("name");
- System.out.println(">> Generating Java class
"+packageName+"."+className);
- File outputFile =
FileWriter.createClassFile(this.configuration.getOutputLocation(), packageName,
className, ".java");
- if (outputFile.exists())
+ System.out.println(">> Generating Java class " +
packageName + "." + className);
+ File outputFile =
FileWriter.createClassFile(this.configuration.getOutputLocation(),
+ packageName,
className, ".java");
+ if (outputFile.exists()) {
outputFile.delete();
-
+ }
+
writeClass(interfaceModel, interfaceWriter);
- };
+ }
- };
-
- JavaInterfaceEmitter emitter=new JavaInterfaceEmitter();
+ }
+
+ JavaInterfaceEmitter emitter = new JavaInterfaceEmitter();
emitter.setCodeGenConfiguration(codegenConfiguration);
emitter.setMapper(codegenConfiguration.getTypeMapper());
@@ -137,6 +141,5 @@
throw new CodeGenerationException(e);
}
}
-
}
Modified:
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
URL:
http://svn.apache.org/viewcvs/incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java?rev=394241&r1=394240&r2=394241&view=diff
==============================================================================
---
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
(original)
+++
incubator/tuscany/java/sca/tools/src/main/java/org/apache/tuscany/tools/wsdl2java/generate/WSDL2JavaGenerator.java
Fri Apr 14 18:52:17 2006
@@ -16,7 +16,6 @@
*/
package org.apache.tuscany.tools.wsdl2java.generate;
-
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
@@ -52,268 +51,243 @@
import commonj.sdo.helper.XSDHelper;
-
public class WSDL2JavaGenerator {
-
- /**
- * Generate Java interfaces from WSDL
- *
- * Usage arguments:
- *
- * [ -targetDirectory <target-root-directory> ]
- * [ -javaPackage <java-package-name> ]
- * <wsdl-file>
- *
- * For example:
- *
- * generate somedir/somefile.wsdl
- *
- * Basic options:
- *
- * -targetDirectory
- * Generates the Java source code in the specified directory. By
default, the code is generated
- * in the same directory as the input wsdl file.
- * -javaPackage
- * Overrides the Java package for the generated classes. By default
the package name is derived
- * from the targetNamespace of the WSDL definition being generated.
For example, if the targetNamespace is
- * "http://www.example.com/simple";, the default package will be
"com.example.simple".
- */
- public static void main(String args[])
- {
- if (args.length == 0)
- {
- printUsage();
- return;
- }
-
-
- String targetDirectory = null;
- String wsdlJavaPackage = null;
- String xsdJavaPackage = null;
-
- int genOptions = 0;
-
- int index = 0;
- for (; index < args.length && args[index].startsWith("-"); ++index)
- {
- if (args[index].equalsIgnoreCase("-targetDirectory"))
- {
- targetDirectory = args[++index];
- }
- else if (args[index].equalsIgnoreCase("-javaPackage"))
- {
- wsdlJavaPackage = args[++index];
- }
- //else if (...)
- else
- {
- printUsage();
- return;
- }
- }
-
- String wsdlFileName = args[index];
- if (wsdlFileName==null || targetDirectory==null) {
- printUsage();
- return;
- }
- generateFromWSDL(wsdlFileName, targetDirectory, wsdlJavaPackage,
xsdJavaPackage, 0);
-
- }
-
- public static void generateFromWSDL(String wsdlFileName, String
targetDirectory, String wsdlJavaPackage, String xsdJavaPackage, int genOptions)
- {
- DataObjectUtil.initRuntime();
- EPackage.Registry packageRegistry = new
EPackageRegistryImpl(EPackage.Registry.INSTANCE);
- ExtendedMetaData extendedMetaData = new
BasicExtendedMetaData(packageRegistry);
- XSDHelper xsdHelper = new XSDHelperImpl(extendedMetaData);
-
- try
- {
- File inputFile = new File(wsdlFileName).getAbsoluteFile();
- InputStream inputStream = new FileInputStream(inputFile);
- xsdHelper.define(inputStream, inputFile.toURI().toString());
-
- if (targetDirectory == null)
- {
- targetDirectory = new
File(wsdlFileName).getCanonicalFile().getParent();
- }
- else
- {
- targetDirectory = new File(targetDirectory).getCanonicalPath();
- }
-
- Map<QName, String> typeMapping=new HashMap<QName, String>();
- if (!packageRegistry.values().isEmpty())
- {
- ResourceSet resourceSet = DataObjectUtil.createResourceSet();
-
- List<GenPackage> genPackages=new ArrayList<GenPackage>();
- Map<EClass, GenClass> genClasses=new HashMap<EClass, GenClass>();
-
- for (Iterator iter = packageRegistry.values().iterator();
iter.hasNext();)
- {
- EPackage currentEPackage = (EPackage)iter.next();
- String currentBasePackage = extractBasePackageName(currentEPackage,
xsdJavaPackage);
- String currentPrefix =
CodeGenUtil.capName(currentEPackage.getName());
-
- GenPackage currentGenPackage = createGenPackage(currentEPackage,
currentBasePackage, currentPrefix, genOptions, resourceSet);
- genPackages.add(currentGenPackage);
- for (GenClass genClass :
(List<GenClass>)currentGenPackage.getGenClasses()) {
- genClasses.put(genClass.getEcoreClass(), genClass);
- }
-
+ /**
+ * Generate Java interfaces from WSDL Usage arguments: [ -targetDirectory
+ * <target-root-directory> ] [ -javaPackage <java-package-name> ]
+ * <wsdl-file> For example: generate somedir/somefile.wsdl Basic options:
+ * -targetDirectory Generates the Java source code in the specified
+ * directory. By default, the code is generated in the same directory as
the
+ * input wsdl file. -javaPackage Overrides the Java package for the
+ * generated classes. By default the package name is derived from the
+ * targetNamespace of the WSDL definition being generated. For example, if
+ * the targetNamespace is "http://www.example.com/simple";, the default
+ * package will be "com.example.simple".
+ */
+ public static void main(String args[]) {
+ if (args.length == 0) {
+ printUsage();
+ return;
+ }
+
+ String targetDirectory = null;
+ String wsdlJavaPackage = null;
+ String xsdJavaPackage = null;
+
+ int index = 0;
+ for (; index < args.length && args[index].startsWith("-"); ++index) {
+ if (args[index].equalsIgnoreCase("-targetDirectory")) {
+ targetDirectory = args[++index];
+ } else if (args[index].equalsIgnoreCase("-javaPackage")) {
+ wsdlJavaPackage = args[++index];
+ }
+ // else if (...)
+ else {
+ printUsage();
+ return;
+ }
+ }
+
+ String wsdlFileName = args[index];
+ if (wsdlFileName == null || targetDirectory == null) {
+ printUsage();
+ return;
}
- for (GenPackage currentGenPackage : genPackages) {
- EPackage currentEPackage=currentGenPackage.getEcorePackage();
- for (GenClass genClass :
(List<GenClass>)currentGenPackage.getGenClasses()) {
- QName qname=new
QName(extendedMetaData.getNamespace(currentEPackage),
extendedMetaData.getName(genClass.getEcoreClass()));
- String
interfaceName=currentGenPackage.getInterfacePackageName()+'.'+genClass.getInterfaceName();
- typeMapping.put(qname, interfaceName);
+ generateFromWSDL(wsdlFileName, targetDirectory, wsdlJavaPackage,
xsdJavaPackage, 0);
+
+ }
+
+ @SuppressWarnings("unchecked")
+ public static void generateFromWSDL(String wsdlFileName, String
targetDirectory,
+ String wsdlJavaPackage,
+ String xsdJavaPackage, int genOptions)
{
+ DataObjectUtil.initRuntime();
+ EPackage.Registry packageRegistry = new
EPackageRegistryImpl(EPackage.Registry.INSTANCE);
+ ExtendedMetaData extendedMetaData = new
BasicExtendedMetaData(packageRegistry);
+ XSDHelper xsdHelper = new XSDHelperImpl(extendedMetaData);
+
+ try {
+ File inputFile = new File(wsdlFileName).getAbsoluteFile();
+ InputStream inputStream = new FileInputStream(inputFile);
+ xsdHelper.define(inputStream, inputFile.toURI().toString());
+
+ if (targetDirectory == null) {
+ targetDirectory = new
File(wsdlFileName).getCanonicalFile().getParent();
+ } else {
+ targetDirectory = new File(targetDirectory).getCanonicalPath();
}
-
- EClass
documentRoot=extendedMetaData.getDocumentRoot(currentEPackage);
- if (documentRoot!=null) {
- for (EStructuralFeature element :
(List<EStructuralFeature>)extendedMetaData.getElements(documentRoot)) {
- EClassifier elementType=element.getEType();
- if (extendedMetaData.isAnonymous(elementType)) {
- EClass eClass=(EClass)elementType;
- EStructuralFeature
feature=(EStructuralFeature)eClass.getEStructuralFeatures().get(0);
- elementType=feature.getEType();
+
+ Map<QName, String> typeMapping = new HashMap<QName, String>();
+ if (!packageRegistry.values().isEmpty()) {
+ ResourceSet resourceSet = DataObjectUtil.createResourceSet();
+
+ List<GenPackage> genPackages = new ArrayList<GenPackage>();
+ Map<EClass, GenClass> genClasses = new HashMap<EClass,
GenClass>();
+
+ for (Iterator iter = packageRegistry.values().iterator();
iter.hasNext();) {
+ EPackage currentEPackage = (EPackage)iter.next();
+ String currentBasePackage =
extractBasePackageName(currentEPackage, xsdJavaPackage);
+ String currentPrefix =
CodeGenUtil.capName(currentEPackage.getName());
+
+ GenPackage currentGenPackage =
createGenPackage(currentEPackage, currentBasePackage,
+
currentPrefix, genOptions, resourceSet);
+ genPackages.add(currentGenPackage);
+ for (GenClass genClass :
(List<GenClass>)currentGenPackage.getGenClasses()) {
+ genClasses.put(genClass.getEcoreClass(), genClass);
}
- if (elementType instanceof EClass) {
- GenClass genClass=genClasses.get(elementType);
- QName qname=new
QName(extendedMetaData.getNamespace(currentEPackage),
extendedMetaData.getName(element));
- String
interfaceName=genClass.getGenPackage().getInterfacePackageName()+'.'+genClass.getInterfaceName();
- typeMapping.put(qname, interfaceName);
- } else if (elementType instanceof EClassifier) {
- QName qname=new
QName(extendedMetaData.getNamespace(currentEPackage),
extendedMetaData.getName(element));
- String
interfaceName=elementType.getInstanceClass().getName();
+
+ }
+
+ for (GenPackage currentGenPackage : genPackages) {
+ EPackage currentEPackage =
currentGenPackage.getEcorePackage();
+ for (GenClass genClass :
(List<GenClass>)currentGenPackage.getGenClasses()) {
+ QName qname = new
QName(extendedMetaData.getNamespace(currentEPackage),
+
extendedMetaData.getName(genClass.getEcoreClass()));
+ String interfaceName =
currentGenPackage.getInterfacePackageName() + '.'
+ + genClass.getInterfaceName();
typeMapping.put(qname, interfaceName);
}
+
+ EClass documentRoot =
extendedMetaData.getDocumentRoot(currentEPackage);
+ if (documentRoot != null) {
+ for (EStructuralFeature element :
(List<EStructuralFeature>)extendedMetaData
+ .getElements(documentRoot)) {
+ EClassifier elementType = element.getEType();
+ if (extendedMetaData.isAnonymous(elementType)) {
+ EClass eClass = (EClass)elementType;
+ EStructuralFeature feature =
(EStructuralFeature)eClass
+ .getEStructuralFeatures().get(0);
+ elementType = feature.getEType();
+ }
+ if (elementType instanceof EClass) {
+ GenClass genClass =
genClasses.get(elementType);
+ QName qname = new
QName(extendedMetaData.getNamespace(currentEPackage),
+
extendedMetaData.getName(element));
+ String interfaceName =
genClass.getGenPackage().getInterfacePackageName()
+ + '.' +
genClass.getInterfaceName();
+ typeMapping.put(qname, interfaceName);
+ } else if (elementType instanceof EClassifier) {
+ QName qname = new
QName(extendedMetaData.getNamespace(currentEPackage),
+
extendedMetaData.getName(element));
+ String interfaceName =
elementType.getInstanceClass().getName();
+ typeMapping.put(qname, interfaceName);
+ }
+ }
+ }
}
}
- }
- }
- try {
- JavaInterfaceGenerator codeGenerator=new
JavaInterfaceGenerator(wsdlFileName, targetDirectory, wsdlJavaPackage,
typeMapping);
- codeGenerator.generate();
- } catch (Exception e) {
- throw new IllegalArgumentException(e);
- }
-
- }
- catch (IOException e)
- {
- throw new IllegalArgumentException(e);
+ try {
+ JavaInterfaceGenerator codeGenerator = new
JavaInterfaceGenerator(wsdlFileName,
+
targetDirectory,
+
wsdlJavaPackage,
+
typeMapping);
+ codeGenerator.generate();
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ } catch (IOException e) {
+ throw new IllegalArgumentException(e);
+ }
}
- }
-
- public static GenPackage createGenPackage(EPackage ePackage, String
basePackage, String prefix, int genOptions, ResourceSet resourceSet)
- {
- GenModel genModel = ecore2GenModel(ePackage, basePackage, prefix,
genOptions);
-
- URI ecoreURI = URI.createURI("file:///" + ePackage.getName() + ".ecore");
- URI genModelURI =
ecoreURI.trimFileExtension().appendFileExtension("genmodel");
-
- Resource ecoreResource = resourceSet.createResource(ecoreURI);
- ecoreResource.getContents().add(ePackage);
-
- Resource genModelResource = resourceSet.createResource(genModelURI);
- genModelResource.getContents().add(genModel);
-
- return (GenPackage)genModel.getGenPackages().get(0);
- }
-
- public static GenModel ecore2GenModel(EPackage ePackage, String basePackage,
String prefix, int genOptions)
- {
- GenModel genModel = GenModelFactory.eINSTANCE.createGenModel();
- genModel.initialize(Collections.singleton(ePackage));
-
- genModel.setRootExtendsInterface("");
- genModel.setRootImplementsInterface("commonj.sdo.DataObject");
- genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectImpl");
- genModel.setFeatureMapWrapperInterface("commonj.sdo.Sequence");
-
genModel.setFeatureMapWrapperInternalInterface("org.apache.tuscany.sdo.util.BasicSequence");
-
genModel.setFeatureMapWrapperClass("org.apache.tuscany.sdo.util.BasicSequence");
- genModel.setSuppressEMFTypes(true);
- genModel.setSuppressEMFMetaData(true);
- genModel.setSuppressEMFModelTags(true);
- genModel.setCanGenerate(true);
- //FIXME workaround java.lang.NoClassDefFoundError:
org/eclipse/jdt/core/jdom/IDOMNode with 02162006 build
- genModel.setFacadeHelperClass("Hack");
- genModel.setForceOverwrite(true);
-
- GenPackage genPackage = (GenPackage)genModel.getGenPackages().get(0);
-
- if (basePackage != null)
- {
- genPackage.setBasePackage(basePackage);
+
+ @SuppressWarnings("unchecked")
+ public static GenPackage createGenPackage(EPackage ePackage, String
basePackage, String prefix,
+ int genOptions, ResourceSet
resourceSet) {
+ GenModel genModel = ecore2GenModel(ePackage, basePackage, prefix,
genOptions);
+
+ URI ecoreURI = URI.createURI("file:///" + ePackage.getName() +
".ecore");
+ URI genModelURI =
ecoreURI.trimFileExtension().appendFileExtension("genmodel");
+
+ Resource ecoreResource = resourceSet.createResource(ecoreURI);
+ ecoreResource.getContents().add(ePackage);
+
+ Resource genModelResource = resourceSet.createResource(genModelURI);
+ genModelResource.getContents().add(genModel);
+
+ return (GenPackage)genModel.getGenPackages().get(0);
}
- if (prefix != null)
- {
- genPackage.setPrefix(prefix);
+
+ public static GenModel ecore2GenModel(EPackage ePackage, String
basePackage,
+ String prefix, int genOptions) {
+ GenModel genModel = GenModelFactory.eINSTANCE.createGenModel();
+ genModel.initialize(Collections.singleton(ePackage));
+
+ genModel.setRootExtendsInterface("");
+ genModel.setRootImplementsInterface("commonj.sdo.DataObject");
+
genModel.setRootExtendsClass("org.apache.tuscany.sdo.impl.DataObjectImpl");
+ genModel.setFeatureMapWrapperInterface("commonj.sdo.Sequence");
+
genModel.setFeatureMapWrapperInternalInterface("org.apache.tuscany.sdo.util.BasicSequence");
+
genModel.setFeatureMapWrapperClass("org.apache.tuscany.sdo.util.BasicSequence");
+ genModel.setSuppressEMFTypes(true);
+ genModel.setSuppressEMFMetaData(true);
+ genModel.setSuppressEMFModelTags(true);
+ genModel.setCanGenerate(true);
+ // FIXME workaround java.lang.NoClassDefFoundError:
+ // org/eclipse/jdt/core/jdom/IDOMNode with 02162006 build
+ genModel.setFacadeHelperClass("Hack");
+ genModel.setForceOverwrite(true);
+
+ GenPackage genPackage = (GenPackage)genModel.getGenPackages().get(0);
+
+ if (basePackage != null) {
+ genPackage.setBasePackage(basePackage);
+ }
+ if (prefix != null) {
+ genPackage.setPrefix(prefix);
+ }
+
+ return genModel;
}
- return genModel;
- }
+ public static String extractBasePackageName(EPackage ePackage, String
javaPackage) {
+ String qualifiedName = javaPackage != null ? javaPackage :
ePackage.getName();
+ String name = /* CodeGenUtil. */shortName(qualifiedName);
+ String baseName = qualifiedName.substring(0, qualifiedName.length() -
name.length());
+ if (javaPackage != null || !name.equals(qualifiedName)) {
+ ePackage.setName(name);
+ }
+ return baseName != null ? /* CodeGenUtil.
*/safeQualifiedName(baseName) : null;
+ }
- public static String extractBasePackageName(EPackage ePackage, String
javaPackage)
- {
- String qualifiedName = javaPackage != null ? javaPackage :
ePackage.getName();
- String name = /*CodeGenUtil.*/shortName(qualifiedName);
- String baseName = qualifiedName.substring(0, qualifiedName.length() -
name.length());
- if (javaPackage != null || !name.equals(qualifiedName))
- {
- ePackage.setName(name);
+ public static String shortName(String qualifiedName) {
+ int index = qualifiedName.lastIndexOf(".");
+ return index != -1 ? qualifiedName.substring(index + 1) :
qualifiedName;
}
- return baseName != null ? /*CodeGenUtil.*/safeQualifiedName(baseName) :
null;
- }
- public static String shortName(String qualifiedName)
- {
- int index = qualifiedName.lastIndexOf(".");
- return index != -1 ? qualifiedName.substring(index + 1) : qualifiedName;
- }
-
- public static String safeQualifiedName(String qualifiedName)
- {
- StringBuffer safeQualifiedName = new StringBuffer();
- for (StringTokenizer stringTokenizer = new StringTokenizer(qualifiedName,
"."); stringTokenizer.hasMoreTokens();)
- {
- String name = stringTokenizer.nextToken();
- safeQualifiedName.append(CodeGenUtil.safeName(name));
- if (stringTokenizer.hasMoreTokens())
- {
- safeQualifiedName.append('.');
- }
+ public static String safeQualifiedName(String qualifiedName) {
+ StringBuffer safeQualifiedName = new StringBuffer();
+ for (StringTokenizer stringTokenizer = new
StringTokenizer(qualifiedName, ".");
+ stringTokenizer.hasMoreTokens();) {
+ String name = stringTokenizer.nextToken();
+ safeQualifiedName.append(CodeGenUtil.safeName(name));
+ if (stringTokenizer.hasMoreTokens()) {
+ safeQualifiedName.append('.');
+ }
+ }
+ return safeQualifiedName.toString();
}
- return safeQualifiedName.toString();
- }
- protected static void printDiagnostic(Diagnostic diagnostic, String indent)
- {
- System.out.print(indent);
- System.out.println(diagnostic.getMessage());
- for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext();)
- {
- printDiagnostic((Diagnostic)i.next(), indent + " ");
+ protected static void printDiagnostic(Diagnostic diagnostic, String
indent) {
+ System.out.print(indent);
+ System.out.println(diagnostic.getMessage());
+ for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext();) {
+ printDiagnostic((Diagnostic)i.next(), indent + " ");
+ }
}
- }
- protected static void printUsage()
- {
- System.out.println("Usage arguments:");
- System.out.println(" [ -targetDirectory <target-root-directory> ]");
- System.out.println(" [ -javaPackage <java-package-name> ]");
- System.out.println(" <wsdl-file>");
- System.out.println("");
- System.out.println("For example:");
- System.out.println("");
- System.out.println(" generate somedir/somefile.wsdl");
- }
+ protected static void printUsage() {
+ System.out.println("Usage arguments:");
+ System.out.println(" [ -targetDirectory <target-root-directory> ]");
+ System.out.println(" [ -javaPackage <java-package-name> ]");
+ System.out.println(" <wsdl-file>");
+ System.out.println("");
+ System.out.println("For example:");
+ System.out.println("");
+ System.out.println(" generate somedir/somefile.wsdl");
+ }
}
