[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 616054 by okellogg:

Further fixes for loading Poseidon 4.1 xmi, e.g.
 http://uml2svg.sourceforge.net/samples/CoffeeMachine.xmi
CCBUG:56184


 M  +6 -3      classifier.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/classifier.cpp #616053:616054
@@ -877,8 +877,10 @@
                 tagEq(tag, "Classifier.feature") ||
                 tagEq(tag, "Namespace.ownedElement") ||
                 tagEq(tag, "Namespace.contents")) {
-            if (! load(element))
-                return false;
+            load(element);
+            // Not evaluating the return value from load()
+            // because we want a best effort.
+
         } else if ((child = makeChildObject(tag)) != NULL) {
             if (child->loadFromXMI(element)) {
                 switch (child->getBaseType()) {
@@ -908,7 +910,8 @@
             UMLDoc *umldoc = UMLApp::app()->getDocument();
             UMLObject *pObject = Object_Factory::makeObjectFromXMI(tag);
             if (pObject == NULL) {
-                totalSuccess = false;
+                // Not setting totalSuccess to false
+                // because we want a best effort.
                 continue;
             }
             pObject->setUMLPackage(this);