[Uml-devel] kdesdk/umbrello/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Fix the "FloatingText: don't know how to treat role 700" part of bug 63884.


  M +8 -13     floatingtext.cpp   1.21


--- kdesdk/umbrello/umbrello/floatingtext.cpp  #1.20:1.21
@@ -545,8 +545,12 @@ bool FloatingText::loadFromXMI( QDomElem
                 m_Role = (Uml::Text_Role)role.toInt();
 
-        int id = UMLWidget::getID();
-        if( id == -1 ) {
+        m_PreText = qElement.attribute( "pretext", "" );
+        m_PostText = qElement.attribute( "posttext", "" );
                 m_Text = qElement.attribute( "text", "" );
-        } else if (playsAssocRole()) {
+
+        int id = UMLWidget::getID();
+        if (id == -1)
+                return true;
+        if (playsAssocRole()) {
                 m_pAssoc = m_pView->findAssocWidget( id );
                 if (m_pAssoc == NULL) {
@@ -583,8 +587,5 @@ bool FloatingText::loadFromXMI( QDomElem
                                 break;
                         default:
-                                kdDebug() << "FloatingText::loadFromXMI: id " << id
-                                          << ": don't know how to handle role "
-                                          << m_Role << endl;
-                                return false;
+                                break;
                 }
         } else if (playsMessageRole()) {
@@ -595,11 +596,5 @@ bool FloatingText::loadFromXMI( QDomElem
                         return false;
                 }
-        } else {
-                kdDebug() << "FloatingText::loadFromXMI: id " << id
-                          << ": don't know how to treat role " << m_Role << endl;
-                return false;
         }
-        m_PreText = qElement.attribute( "pretext", "" );
-        m_PostText = qElement.attribute( "posttext", "" );
 
         return true;