[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 642924 by okellogg:

merge r637211:642917 from branches/KDE/3.5, tabs--

 M  +2 -1      ChangeLog  
 M  +1 -4      umbrello/codegenerator.cpp  
 M  +3 -3      umbrello/codegenerators/sqlwriter.cpp  
 M  +2 -0      umbrello/codeimport/import_utils.cpp  
 M  +1 -1      umbrello/dialogs/parmpropdlg.h  
 M  +2 -2      umbrello/main.cpp  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #642923:642924
@@ -17,12 +17,13 @@
 * 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
+* Unable to delete multiplicity information or label from an association
   (141813)
 * Ada code generator generates "withs" in both directions for certain
   associations (141956)
 * Ada code generator always generates methods abstract even if abstract box
   not checked (142093)
+* Missing "with" on Ada code generation for aggregation (142392)
 
 Version 1.5.61
 
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerator.cpp #642923:642924
@@ -573,14 +573,11 @@
             break;
         case Uml::at_Aggregation:
         case Uml::at_Composition:
-        case Uml::at_Association_Self:
         case Uml::at_Association:
             {
                 UMLObject *objA = a->getObject(Uml::A);
                 UMLObject *objB = a->getObject(Uml::B);
-                // Add related object only if the rolename is not empty.
-                if (objA == c && !a->getRoleName(Uml::B).isEmpty() &&
-                    objB->getBaseType() != Uml::ot_Datatype)
+                if (objA == c && objB->getBaseType() != Uml::ot_Datatype)
                     temp = static_cast<UMLPackage*>(objB);
             }
             break;
--- trunk/KDE/kdesdk/umbrello/umbrello/codegenerators/sqlwriter.cpp #642923:642924
@@ -93,14 +93,14 @@
             UMLObject *objB = a->getObject(Uml::B);
             if (objA->getID() == c->getID() && objB->getID() != c->getID())
                 continue;
-	    constraintMap[a] = a;
+            constraintMap[a] = a;
         }
     }
     
     QMap<UMLAssociation*,UMLAssociation*>::Iterator itor = constraintMap.begin();
     for (;itor != constraintMap.end();itor++) {
-	UMLAssociation* a = itor.data();
-	sql << "ALTER TABLE "<< classname
+        UMLAssociation* a = itor.data();
+        sql << "ALTER TABLE "<< classname
             << " ADD CONSTRAINT " << a->getName() << " FOREIGN KEY ("
             << a->getRoleName(Uml::B) << ") REFERENCES "
             << a->getObject(Uml::A)->getName()
--- trunk/KDE/kdesdk/umbrello/umbrello/codeimport/import_utils.cpp #642923:642924
@@ -34,6 +34,8 @@
 #include "../association.h"
 #include "../object_factory.h"
 
+#include <stdlib.h>
+
 namespace Import_Utils {
 
 /**
--- trunk/KDE/kdesdk/umbrello/umbrello/dialogs/parmpropdlg.h #642923:642924
@@ -32,7 +32,7 @@
  * parent.
  *
  * @short A properties dialog box for a parameter.
- * @author Paul Hensgen	<phensgen at techie.com>
+ * @author Paul Hensgen <phensgen at techie.com>
  * Bugs and comments to uml-devel at lists.sf.net or http://bugs.kde.org
  */
 class ParmPropDlg : public KDialog {
--- trunk/KDE/kdesdk/umbrello/umbrello/main.cpp #642923:642924
@@ -153,10 +153,10 @@
     if (showGUI && showLogo) {
         startLogo = new KStartupLogo(0);
         startLogo->setHideEnabled(true);
-#ifdef Q_OS_UNIX	
+#ifdef Q_OS_UNIX
         KWin::setMainWindow(startLogo, UMLApp::app()->winId());
         KWin::setState(startLogo->winId(), NET::KeepAbove);
-#endif	
+#endif
         startLogo->show();
         QApplication::flush();
     }