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

[Oliver Kellogg]

SVN commit 671969 by okellogg:

Emit addition signal before calling UMLObject::emitModified() (cf. r669599)
BUG:146367


 M  +1 -0      ChangeLog  
 M  +7 -7      umbrello/classifier.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #671968:671969
@@ -10,6 +10,7 @@
 * Attribute documentation not generated for 'Export to XHTML' (145972)
 * Crash when moving a class in a Java UML diagram (146058)
 * Arrowheads are not shown (146064)
+* Crash when creating a class that refers to more than one other classes/datatypes (146367)
 
 Version 1.5.7
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/classifier.cpp #671968:671969
@@ -243,8 +243,8 @@
         kDebug() << "  UMLClassifier::addOperation list after change: " << buf << endl;
      } else
         m_List.append( op );
+    emit operationAdded(op);
     UMLObject::emitModified();
-    emit operationAdded(op);
     connect(op,SIGNAL(modified()),this,SIGNAL(modified()));
     return true;
 }
@@ -547,8 +547,8 @@
     Uml::Visibility scope = Settings::getOptionState().classState.defaultAttributeScope;
     UMLAttribute *a = new UMLAttribute(this, name, id, scope);
     m_List.append(a);
+    emit attributeAdded(a);
     UMLObject::emitModified();
-    emit attributeAdded(a);
     connect(a,SIGNAL(modified()),this,SIGNAL(modified()));
     return a;
 }
@@ -561,8 +561,8 @@
     if (type)
         a->setType(type);
     m_List.append(a);
+    emit attributeAdded(a);
     UMLObject::emitModified();
-    emit attributeAdded(a);
     connect(a,SIGNAL(modified()),this,SIGNAL(modified()));
     return a;
 }
@@ -576,8 +576,8 @@
             m_List.insert(position, att);
         else
             m_List.append(att);
+        emit attributeAdded(att);
         UMLObject::emitModified();
-        emit attributeAdded(att);
         connect(att, SIGNAL(modified()), this, SIGNAL(modified()));
         return true;
     } else if (Log) {
@@ -674,8 +674,8 @@
         return t;
     t = new UMLTemplate(this, name, id);
     m_List.append(t);
+    emit templateAdded(t);
     UMLObject::emitModified();
-    emit templateAdded(t);
     connect(t, SIGNAL(modified()), this, SIGNAL(modified()));
     return t;
 }
@@ -686,8 +686,8 @@
         newTemplate->parent()->removeChild(newTemplate);
         this->insertChild(newTemplate);
         m_List.append(newTemplate);
+        emit templateAdded(newTemplate);
         UMLObject::emitModified();
-        emit templateAdded(newTemplate);
         connect(newTemplate,SIGNAL(modified()),this,SIGNAL(modified()));
         return true;
     } else if (log) {
@@ -707,8 +707,8 @@
             m_List.insert(position,Template);
         else
             m_List.append(Template);
+        emit templateAdded(Template);
         UMLObject::emitModified();
-        emit templateAdded(Template);
         connect(Template,SIGNAL(modified()),this,SIGNAL(modified()));
         return true;
     }