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

[Oliver Kellogg]

SVN commit 460424 by okellogg:

apply(): Make sure the item returned by UMLClassifier::findChildObject()
 is not the dialog's own dedicated one.
BUG:112531


 M  +1 -1      umlattributedialog.cpp  
 M  +1 -1      umlentityattributedialog.cpp  
 M  +1 -1      umltemplatedialog.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/umlattributedialog.cpp #460423:460424
@@ -153,7 +153,7 @@
     }
     UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pAttribute->parent() );
     UMLObject *o = pConcept->findChildObject(name);
-    if (o) {
+    if (o && o != m_pAttribute) {
         KMessageBox::error(this, i18n("The attribute name you have chosen is already being used in this operation."),
                            i18n("Attribute Name Not Unique"), false);
         m_pNameLE->setText( m_pAttribute->getName() );
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/umlentityattributedialog.cpp #460423:460424
@@ -197,7 +197,7 @@
     }
     UMLClassifier * pConcept = dynamic_cast<UMLClassifier *>( m_pEntityAttribute->parent() );
     UMLObject *o = pConcept->findChildObject(name);
-    if (o) {
+    if (o && o != m_pEntityAttribute) {
         KMessageBox::error(this, i18n("The entity attribute name you have chosen is already being used in this operation."),
                            i18n("Entity Attribute Name Not Unique"), false);
         m_pNameLE->setText( m_pEntityAttribute->getName() );
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/dialogs/umltemplatedialog.cpp #460423:460424
@@ -129,7 +129,7 @@
     UMLClassifier * pClass = dynamic_cast<UMLClassifier *>( m_pTemplate->parent() );
     if (pClass) {
         UMLObject *o = pClass->findChildObject(name);
-        if (o) {
+        if (o && o != m_pTemplate) {
             KMessageBox::error(this, i18n("The template parameter name you have chosen is already being used in this operation."),
                                i18n("Template Name Not Unique"), false);
             m_pNameLE->setText( m_pTemplate->getName() );