[Uml-devel] KDE/kdesdk/umbrello/umbrello/codeimport

[Oliver Kellogg]

SVN commit 592818 by okellogg:

createUMLObject(): Reset bPutAtGlobalScope after creating the origType.
insertAttribute(): We need to specify the child object type to seek because
 Ada actually allows an operation and an attribute to have the same name. Wow.


 M  +2 -1      import_utils.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/import_utils.cpp #592817:592818
@@ -184,6 +184,7 @@
                 t = Uml::ot_Class;
             origType = Object_Factory::createUMLObject(t, typeName, parentPkg);
             bNewUMLObjectWasCreated = true;
+            bPutAtGlobalScope = false;
         }
         if (isConst || isAdorned) {
             // Create the full given type (including adornments.)
@@ -245,7 +246,7 @@
         << owner->getName() << " (object type " << ot << ")" << endl;
         return NULL;
     }
-    UMLObject *o = owner->findChildObject(name);
+    UMLObject *o = owner->findChildObject(name, Uml::ot_Attribute);
     if (o) {
         return o;
     }