[Uml-devel] tags/KDE/3.4.92/kdesdk/umbrello/umbrello

[Stephan Kulow]

SVN commit 469828 by coolo:

merge 469459:469788


 M  +1 -1      umlnamespace.cpp  
 M  +7 -2      umlview.cpp  


--- tags/KDE/3.4.92/kdesdk/umbrello/umbrello/umlnamespace.cpp #469827:469828
@@ -67,7 +67,7 @@
     return toString(_v, mnemonic);
 }
 
-Visibility::operator Value() const {
+Visibility::operator Visibility::Value() const {
     return _v;
 }
 
--- tags/KDE/3.4.92/kdesdk/umbrello/umbrello/umlview.cpp #469827:469828
@@ -2379,7 +2379,9 @@
     //   if this object is capable of containing nested objects then
     //     for each of the object's containedObjects
     //       if the containedObject has a widget representation on this view then
-    //         create the containment AssocWidget
+    //         if the containedWidget is not physically located inside this widget
+    //           create the containment AssocWidget
+    //         end if
     //       end if
     //     end loop
     //   end if
@@ -2487,6 +2489,9 @@
             for (UMLWidget *w = m_WidgetList.first(); w; w = m_WidgetList.next()) {
                 if (w->getID() != id)
                     continue;
+                // if the containedWidget is not physically located inside this widget
+                if (widget->rect().contains(w->rect()))
+                    continue;
                 // create the containment AssocWidget
                 AssociationWidget *a = new AssociationWidget(this, widget,
                                        at_Containment, w);
@@ -2510,7 +2515,7 @@
         if (pWidget->getID() == pkgID)
             break;
     }
-    if (pWidget == NULL)
+    if (pWidget == NULL || pWidget->rect().contains(widget->rect()))
         return;
     // create the containment AssocWidget
     AssociationWidget *a = new AssociationWidget(this, pWidget, at_Containment, widget);