[Uml-devel] branches/work/isi-umbrello/umbrello/umbrello

[Florence Mattler]

SVN commit 634022 by mattler:

Miss taping and fix the bug saving the floatingdashline twice in XMI file


 M  +1 -1      umlview.cpp  
 M  +1 -1      widget_factory.cpp  


--- branches/work/isi-umbrello/umbrello/umbrello/umlview.cpp #634021:634022
@@ -2997,7 +2997,7 @@
         // We DONT want to record any text widgets which are belonging
         // to associations as they are recorded later in the "associations"
         // section when each owning association is dumped. -b.t.
-        if (widget->getBaseType() != wt_Text ||
+        if (widget->getBaseType() != wt_Text || widget->getBaseType() != wt_FloatingDashLine ||
                 static_cast<FloatingTextWidget*>(widget)->getLink() == NULL)
             widget->saveToXMI( qDoc, widgetElement );
     }
--- branches/work/isi-umbrello/umbrello/umbrello/widget_factory.cpp #634021:634022
@@ -163,7 +163,7 @@
     UMLWidget *widget = NULL;
     if (tag == "statewidget" || tag == "notewidget" || tag == "boxwidget" ||
         tag == "floatingtext" || tag == "activitywidget" || tag == "forkjoin" || tag == "preconditionwidget" || tag == "endoflifewidget" ||
-        tag == "combinedFragmentwidget"  || tag == "signalwidget"  || "floatingdashdinewidget" ||
+        tag == "combinedFragmentwidget"  || tag == "signalwidget"  || tag == "floatingdashlinewidget" ||
             // tests for backward compatibility:
             tag == "UML:StateWidget" || tag == "UML:NoteWidget" ||
             tag=="UML:CombinedFragmentWidget" || tag == "UML:FloatingTextWidget" || tag == "UML:SignalWidget" || tag == "UML:ActivityWidget") {