[Uml-devel] kdesdk/umbrello/umbrello/codegenerators

[Brian Thomas]

CVS commit by thomas: 

still fiddling with the output. It seems to make for better naming to choose 'GroupType' and 'ComplexType' suffixes for classes which map to complexTypes/groups


  M +7 -2      xmlschemawriter.cpp   1.11


--- kdesdk/umbrello/umbrello/codegenerators/xmlschemawriter.cpp  #1.10:1.11
@@ -384,4 +384,5 @@ void XMLSchemaWriter::writeConcreteClass
         //
         UMLClassifierList superclasses = c->findSuperClassConcepts(m_doc); // list of what inherits from us
+        UMLClassifierList subclasses = c->findSubClassConcepts(m_doc); // list of what inherits from us
         UMLAssociationList aggregations = c->getAggregations();
         UMLAssociationList compositions = c->getCompositions();
@@ -402,4 +403,8 @@ void XMLSchemaWriter::writeConcreteClass
         for(UMLClassifier *classifier = superclasses.first(); classifier; classifier = superclasses.next())
                 writeClassifier(classifier, XMLschema);
+
+        // write out any subclasses as needed
+        for(UMLClassifier *classifier = subclasses.first(); classifier; classifier = subclasses.next())
+                writeClassifier(classifier, XMLschema);
 }
 
@@ -784,5 +789,5 @@ QString XMLSchemaWriter::getElementTypeN
 {
         QString elementName = getElementName(c);
-        return elementName + "SchemaType";
+        return elementName + "ComplexType";
 }
 
@@ -790,5 +795,5 @@ QString XMLSchemaWriter::getElementGroup
 {
         QString elementName = getElementName(c);
-        return elementName + "SchemaInterfaceType";
+        return elementName + "GroupType";
 }