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

[Thibault Normand]

SVN commit 645440 by tnormand:

# SVN MERGE 645339

+ add u/r text to the resize command



 M  +5 -0      ChangeLog  
 M  +2 -1      umbrello/cmds/cmd_resizeWidget.cpp  
 M  +3 -2      umbrello/folder.cpp  
 M  +1 -0      umbrello/umldoc.cpp  
 M  +0 -2      umbrello/umlwidget.h  


--- branches/work/isi-umbrello/umbrello/ChangeLog #645439:645440
@@ -14,11 +14,14 @@
 * Javascript Code Generation creates bad format methods (135540)
 * Incorrect Association Properties text (139872)
 * Buttons are not displayed (139913)
+* Java 5 generics support (140669)
 * Associations not updated during move of class on diagram (140709)
 * Crash when deleting the link between a package and a class (141602)
 * Ada95 Code Generation Errors for Aggregation (141644)
 * Unable to delete multiplicity information or lable from an association
   (141813)
+* Reinstate code generation options for C++ (141875)
+* C++ code generator does not correctly define namespaces (141876)
 * Ada code generator generates "withs" in both directions for certain
   associations (141956)
 * Ada code generator always generates methods abstract even if abstract box
@@ -53,8 +56,10 @@
 * Association line nodes don't drag along with multiply-selected classes (57878)
 * Disappearing parameters when editing class properties (114477)
 * Umbrello saves too many copies in xmi (135606)
+* XML scheme: mixup of attribute names: *color and *colour (136061)
 * Artifacts of a component diagram are wrongly placed in Deployment View folder (137564)
 * Incorrect export to SQL (138139)
+* Parentheses do not appear around the parameters of the C++ operator() (139147)
 
 Version 1.5.52
 
--- branches/work/isi-umbrello/umbrello/umbrello/cmds/cmd_resizeWidget.cpp #645439:645440
@@ -33,7 +33,8 @@
 {
 
 	cmdResizeWidget::cmdResizeWidget(UMLWidgetController* _UMLwc):UMLwc(_UMLwc),already(false)
-	{	
+	{
+		setText(i18n("Resizing Widget."));	
 		UMLWidget * w = _UMLwc->getWidget();
 		W = w->width();
 		H = w->height();
--- branches/work/isi-umbrello/umbrello/umbrello/folder.cpp #645439:645440
@@ -154,14 +154,15 @@
         UMLFolder *f = static_cast<UMLFolder*>(o);
         f->removeAllViews();
     }
+
     UMLView *v = NULL;
     for (UMLViewListIt vit(m_diagrams); (v = vit.current()) != NULL; ++vit) {
         // TODO ------------------ check this code - bad: calling back to UMLDoc::removeView()
-        v->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations
+        //v->removeAllAssociations(); // note : It may not be apparent, but when we remove all associations
         // from a view, it also causes any UMLAssociations that lack parent
         // association widgets (but once had them) to remove themselves from
         // this document.
-        UMLApp::app()->getDocument()->removeView(v, false);
+	UMLApp::app()->getDocument()->removeView(v, false);
     }
     m_diagrams.clear();
 }
--- branches/work/isi-umbrello/umbrello/umbrello/umldoc.cpp #645439:645440
@@ -1833,6 +1833,7 @@
 void UMLDoc::removeAllViews() {
     for (int i = 0; i < Uml::N_MODELTYPES; i++)
         m_root[i]->removeAllViews();
+
     UMLApp::app()->setCurrentView(NULL);
     emit sigDiagramChanged(dt_Undefined);
     UMLApp::app()->setDiagramMenuItemsState(false);
--- branches/work/isi-umbrello/umbrello/umbrello/umlwidget.h #645439:645440
@@ -444,8 +444,6 @@
 
     /**
      * Show a properties dialog for a UMLWidget.
-     *
-     * @return  True if the widget was modified.
      */
     virtual void showProperties();