Author: dkulp
Date: Fri Jul 31 15:14:40 2009
New Revision: 799634
URL: http://svn.apache.org/viewvc?rev=799634&view=rev
Log:
Fill in more stuff into the ClassCollector
Modified:
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
Modified:
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java?rev=799634&r1=799633&r2=799634&view=diff
==============================================================================
---
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
(original)
+++
cxf/trunk/rt/databinding/sdo/src/main/java/org/apache/cxf/sdo/tools/SDODatabinding.java
Fri Jul 31 15:14:40 2009
@@ -121,7 +121,8 @@
processArguments(args);
-
+ ClassCollector classCollector = context.get(ClassCollector.class);
+
((XSDHelperImpl)xsdHelper).setRedefineBuiltIn(generateBuiltIn);
for (XmlSchema schema : schemaCollection.getXmlSchemas()) {
if
(schema.getTargetNamespace().equals(XmlSchemaConstants.XSD_NAMESPACE_URI)) {
@@ -155,14 +156,30 @@
GenClass genClass = classIter.next();
genClasses.put(genClass.getEcoreClass(), genClass);
- //This gets the "impl" classes, how do we get
everything else?
+ //This gets the "impl" classes, how do we get
everything else?
String s = genClass.getQualifiedClassName();
String p = s.substring(0, s.lastIndexOf('.'));
s = s.substring(s.lastIndexOf('.') + 1);
classCollector.addTypesClassName(p,
s,
genClass.getQualifiedClassName());
+
+ p = genClass.getGenPackage().getInterfacePackageName();
+ s = genClass.getInterfaceName();
+ classCollector.addTypesClassName(p,
+ s,
+ p + "." + s);
}
+ String p = genPackage.getInterfacePackageName();
+ String s = genPackage.getFactoryInterfaceName();
+ classCollector.addTypesClassName(p,
+ s,
+ p + "." + s);
+ p = genPackage.getClassPackageName();
+ s = genPackage.getFactoryClassName();
+ classCollector.addTypesClassName(p,
+ s,
+ p + "." + s);
}
}
} catch (Exception e) {
