[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Implement loading of argoUML XMI files (still has rough edges.)


  M +0 -3      class.cpp   1.33
  M +4 -5      operation.cpp   1.20


--- kdesdk/umbrello/umbrello/class.cpp  #1.32:1.33
@@ -368,7 +368,4 @@ bool UMLClass::loadSpecialized(QDomEleme
                         kdWarning() << "unknown listtype with stereotype:" << listType << endl;
                 }
-        } else {
-                kdWarning() << "UMLClass::load(" << getName()
-                            << "): unknown child type " << tag << endl;
         }
         return true;

--- kdesdk/umbrello/umbrello/operation.cpp  #1.19:1.20
@@ -192,7 +192,9 @@ bool UMLOperation::load( QDomElement & e
         QDomElement attElement = node.toElement();
         while( !attElement.isNull() ) {
-                // Should be UML:Parameter tag name but check anyway.
                 QString tag = attElement.tagName();
-                if (tagEq(tag, "Parameter")) {
+                if (tagEq(tag, "BehavioralFeature.parameter")) {
+                        if (! load(attElement))
+                                return false;
+                } else if (tagEq(tag, "Parameter")) {
                         UMLAttribute * pAtt = new UMLAttribute( this );
                         if( !pAtt -> UMLObject::loadFromXMI( attElement ) )
@@ -208,7 +210,4 @@ bool UMLOperation::load( QDomElement & e
                         pAtt -> setInitialValue( attElement.attribute( "value", "" ) );
                         m_List.append( pAtt );
-                } else {
-                        kdDebug() << "UMLOperation::loadFromXMI: Ignoring unknown tag "
-                                  << tag << endl;
                 }
                 node = node.nextSibling();