[Uml-devel] KDE_3_2_BRANCH: kdesdk/umbrello/umbrello

[Jonathan Riddell]

CVS commit by jriddell: 

backport beaste fix from 09 Feb
--
CVS commit by thomas:

bug fix: XMI loading of code operations incorrect, parent_id is not found. Fixed now.


  M +1 -1      codegenobjectwithtextblocks.cpp   1.10.2.2
  M +1 -1      codegenerators/cppheadercodedocument.cpp   1.18.2.1
  M +1 -1      codegenerators/javaantcodedocument.cpp   1.9.2.1
  M +1 -1      codegenerators/javaclassifiercodedocument.cpp   1.20.2.1


--- kdesdk/umbrello/umbrello/codegenobjectwithtextblocks.cpp  #1.10.2.1:1.10.2.2
@@ -469,5 +469,5 @@ void CodeGenObjectWithTextBlocks::loadCh
                                 if( name == "codeoperation" ) {
                                        // find the code operation by id
-                                        QString id = element.attribute("parent_op","-1");
+                                        QString id = element.attribute("parent_id","-1");
                                         UMLObject * obj = getParentGenerator()->getDocument()->findUMLObject(id.toInt());
                                         UMLOperation * op = dynamic_cast<UMLOperation*>(obj);

--- kdesdk/umbrello/umbrello/codegenerators/cppheadercodedocument.cpp  #1.18:1.18.2.1
@@ -157,5 +157,5 @@ void CPPHeaderCodeDocument::loadChildTex
                                 if( name == "codeoperation" ) {
                                        // find the code operation by id
-                                        QString id = element.attribute("parent_op","-1");
+                                        QString id = element.attribute("parent_id","-1");
                                         UMLObject * obj = getParentGenerator()->getDocument()->findUMLObject(id.toInt());
                                         UMLOperation * op = dynamic_cast<UMLOperation*>(obj);

--- kdesdk/umbrello/umbrello/codegenerators/javaantcodedocument.cpp  #1.9:1.9.2.1
@@ -146,5 +146,5 @@ void JavaANTCodeDocument::loadChildTextB
                                 if( name == "codeoperation" ) {
                                        // find the code operation by id
-                                        QString id = element.attribute("parent_op","-1");
+                                        QString id = element.attribute("parent_id","-1");
                                         UMLObject * obj = getParentGenerator()->getDocument()->findUMLObject(id.toInt());
                                         UMLOperation * op = dynamic_cast<UMLOperation*>(obj);

--- kdesdk/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp  #1.20:1.20.2.1
@@ -255,5 +255,5 @@ void JavaClassifierCodeDocument::loadChi
                                 if( name == "codeoperation" ) {
                                        // find the code operation by id
-                                        QString id = element.attribute("parent_op","-1");
+                                        QString id = element.attribute("parent_id","-1");
                                         UMLObject * obj = getParentGenerator()->getDocument()->findUMLObject(id.toInt());
                                         UMLOperation * op = dynamic_cast<UMLOperation*>(obj);