[Uml-devel] [Bug 146064] arrowheads are not shown

[Oliver Kellogg]

------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.
         
http://bugs.kde.org/show_bug.cgi?id=146064         
okellogg users sourceforge net changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|UNCONFIRMED                 |RESOLVED
         Resolution|                            |FIXED



------- Additional Comments From okellogg users sourceforge net  2007-05-28 23:44 -------
SVN commit 669259 by okellogg:

loadFromXMI(): Before version 1.5.7, we forgot to write the "type" attribute
 of the AssociationWidget in saveToXMI().  As a workaround on loading pre-
 1.5.7 XMI files, use the type from the UMLAssociation.
BUG:146064


 M  +2 -0      ChangeLog  
 M  +14 -0     umbrello/associationwidget.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #669258:669259
 @ -1,12 +1,14  @
 Version 1.5.71
 
 * Bugs/wishes from http://bugs.kde.org:
+* Switching between tabbed and non-tabbed views requires restart (98204)
 * Preprocessor keywords ignored which causes endless loop in code import (119125)
 * Unstable saves and loads, class names become dirty (145709)
 * Crash on deleting class in list view (145762)
 * Class attribute documentation not generated for python (145916)
 * Python code generator does not wrap lines properly (145918)
 * Attribute documentation not generated for 'Export to XHTML' (145972)
+* Arrowheads are not shown (146064)
 
 Version 1.5.7
 
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/associationwidget.cpp #669258:669259
 @ -3437,7 +3437,21  @
         }
 
         // New style: The xmi.id is a reference to the UMLAssociation.
+        // If the UMLObject is not found right now, we try again later
+        // during the type resolution pass - see activate().
         m_nId = STR2ID(id);
+        UMLObject *myObj = m_umldoc->findObjectById(m_nId);
+        if (myObj) {
+            const Uml::Object_Type ot = myObj->getBaseType();
+            if (ot != ot_Association) {
+                setUMLObject(myObj);
+            } else {
+                UMLAssociation * myAssoc = static_cast<UMLAssociation*>(myObj);
+                setUMLAssociation(myAssoc);
+                if (type == "-1")
+                    aType = myAssoc->getAssocType();
+            }
+        }
     }
 
     setAssocType(aType);