SVN commit 681957 by okellogg:

Call UMLObject::emitModified() only AFTER all else is done, cf. r681952


 M  +8 -8      entity.cpp  


--- trunk/KDE/kdesdk/umbrello/umbrello/entity.cpp #681956:681957
@@ -151,8 +151,8 @@
     addConstraint(newUniqueConstraint);
 
     UMLDoc *umldoc = UMLApp::app()->getDocument();
+    umldoc->signalUMLObjectCreated(newUniqueConstraint);
     emitModified();
-    umldoc->signalUMLObjectCreated(newUniqueConstraint);
     return newUniqueConstraint;
 
 }
@@ -195,8 +195,8 @@
     addConstraint(newForeignKeyConstraint);
 
     UMLDoc *umldoc = UMLApp::app()->getDocument();
+    umldoc->signalUMLObjectCreated(newForeignKeyConstraint);
     emitModified();
-    umldoc->signalUMLObjectCreated(newForeignKeyConstraint);
     return newForeignKeyConstraint;
 
 }
@@ -240,8 +240,8 @@
     addConstraint(newCheckConstraint);
 
     UMLDoc *umldoc = UMLApp::app()->getDocument();
+    umldoc->signalUMLObjectCreated(newCheckConstraint);
     emitModified();
-    umldoc->signalUMLObjectCreated(newCheckConstraint);
     return newCheckConstraint;
 }
 
@@ -249,8 +249,8 @@
 UMLObject* UMLEntity::addEntityAttribute(const QString& name, Uml::IDType id) {
     UMLEntityAttribute* literal = new UMLEntityAttribute(this, name, id);
     m_List.append(literal);
+    emit entityAttributeAdded(literal);
     UMLObject::emitModified();
-    emit entityAttributeAdded(literal);
     connect(literal,SIGNAL(modified()),this,SIGNAL(modified()));
     return literal;
 }
@@ -261,8 +261,8 @@
         attribute->parent()->removeChild(attribute);
         this->insertChild(attribute);
         m_List.append(attribute);
+        emit entityAttributeAdded(attribute);
         UMLObject::emitModified();
-        emit entityAttributeAdded(attribute);
         connect(attribute,SIGNAL(modified()),this,SIGNAL(modified()));
         return true;
     } else if (Log) {
@@ -282,8 +282,8 @@
         } else {
             m_List.append(attribute);
         }
+        emit entityAttributeAdded(attribute);
         UMLObject::emitModified();
-        emit entityAttributeAdded(attribute);
         connect(attribute,SIGNAL(modified()),this,SIGNAL(modified()));
         return true;
     }
@@ -455,8 +455,8 @@
 
     m_List.append( constr );
 
+    emit entityConstraintAdded(constr);
     UMLObject::emitModified();
-    emit entityConstraintAdded(constr);
     connect(constr,SIGNAL(modified()),this,SIGNAL(modified()));
 
     return true;
@@ -475,8 +475,8 @@
 
     m_List.remove( constr );
 
+    emit entityConstraintRemoved(constr);
     UMLObject::emitModified();
-    emit entityConstraintRemoved(constr);
 
     delete constr;
     return true;