[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 511243 by okellogg:

apply commit 511242 from branches/KDE/3.5

 M  +2 -0      ChangeLog  
 M  +3 -10     umbrello/associationwidget.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #511242:511243
@@ -6,6 +6,7 @@
   http://sourceforge.net/mailarchive/forum.php?thread_id=9558795&forum_id=472
 * Bugs/wishes from http://bugs.kde.org:
 * Import Rose model files (81364)
+* Documentation for association roles not saved (105661)
 * Default data types not added for old Java generator (115991)
 * Custom operations in sequence diagrams become class operations (120337)
 * Multiplicity labels positioned incorrectly when moving entities (120598)
@@ -13,6 +14,7 @@
 * Unable to delete entity from entity list in "UML Model" frame (120750)
 * Interface names not italicized in diagram view (120761)
 * Cannot Resize Sequence Diagram Synchronous Messages (120910)
+* Documentation for associations is not retained (121478, 122063)
 * Crash when importing Python files (121952)
 * "void" is imported as class and not datatypes (122184)
 * Crash when creating a datatype with the same name as a class (122188)
--- trunk/KDE/kdesdk/umbrello/umbrello/associationwidget.cpp #511242:511243
@@ -23,6 +23,7 @@
 #include <kdebug.h>
 #include <klocale.h>
 #include <kcolordialog.h>
+#include <kapplication.h>
 // app includes
 #include "activitywidget.h"
 #include "uml.h"
@@ -2959,11 +2960,7 @@
         m_role[A].m_pChangeWidget-> setSelected( _select );
     if( m_role[B].m_pChangeWidget)
         m_role[B].m_pChangeWidget-> setSelected( _select );
-    /**
-     * @fixme MYSTERY:
-     *        If the following code is activated and the m_LinePath.setSelected()
-     *        precedes it then the blue selection markers sometimes disappear
-     *        (notably on messages in collaboration diagrams.)
+    kapp->processEvents();
     //Update the docwindow for this association.
     // This is done last because each of the above setSelected calls
     // overwrites the docwindow, but we want the main association doc
@@ -2973,11 +2970,7 @@
                 m_pView -> showDocumentation( this, false );
     } else
         m_pView -> updateDocumentation( true );
-     */
-    /** @fixme Had to pull the m_LinePath.setSelected() call down here
-     *         because otherwise the blue selection markers would not show
-     *         when selecting collaboration messages.
-     */
+    kapp->processEvents();
     m_LinePath.setSelected( _select );
     if (! _select) {
         // For now, if _select is true we don't make the assoc class line