[Uml-devel] KDE/kdesdk/umbrello

[Oliver Kellogg]

SVN commit 505044 by okellogg:

sync with branches/KDE/3.5

 M  +5 -2      ChangeLog  
 M  +3 -0      umbrello/Makefile.am  
 A             umbrello/import_rose.cpp   [License: GPL (v2+)]
 A             umbrello/import_rose.h   [License: GPL (v2+)]
 M  +7 -3      umbrello/import_utils.cpp  
 M  +9 -0      umbrello/import_utils.h  
 A             umbrello/petalnode.cpp   [License: GPL (v2+)]
 A             umbrello/petalnode.h   [License: GPL (v2+)]
 A             umbrello/petaltree2uml.cpp   [License: GPL (v2+)]
 A             umbrello/petaltree2uml.h   [License: GPL (v2+)]
 M  +5 -1      umbrello/uml.cpp  
 M  +5 -1      umbrello/umldoc.cpp  
 M  +1 -1      umbrello/umldoc.h  


--- trunk/KDE/kdesdk/umbrello/ChangeLog #505043:505044
@@ -1,9 +1,12 @@
 Version 1.5.2
 
-* fix problem reordering methods in classes/interfaces (http://bugs.debian.org/348940,
-  http://bugs.kde.org/119991)
+* fixed problem reordering methods in classes/interfaces
+  http://bugs.debian.org/348940 , http://bugs.kde.org/119991
+* fixed problem with font size computation/word wrap in note widgets
+  http://sourceforge.net/mailarchive/forum.php?thread_id=9558795&forum_id=472
 * Bugs/wishes from http://bugs.kde.org:
 * Multiplicity labels positioned incorrectly when moving entities (120598)
+* Cannot Resize Sequence Diagram Synchronous Messages (120910)
 
 Version 1.5.1
 
--- trunk/KDE/kdesdk/umbrello/umbrello/Makefile.am #505043:505044
@@ -51,6 +51,7 @@
 kplayerslideraction.cpp \
 hierarchicalcodeblock.cpp \
 idlimport.cpp \
+import_rose.cpp \
 import_utils.cpp \
 infowidget.cpp \
 javaimport.cpp \
@@ -72,6 +73,8 @@
 ownedhierarchicalcodeblock.cpp \
 package.cpp \
 packagewidget.cpp \
+petalnode.cpp \
+petaltree2uml.cpp \
 plugin.cpp \
 pluginloader.cpp \
 pythonimport.cpp \
--- trunk/KDE/kdesdk/umbrello/umbrello/import_utils.cpp #505043:505044
@@ -62,6 +62,10 @@
     bPutAtGlobalScope = yesno;
 }
 
+void assignUniqueIdOnCreation(bool yesno) {
+    Object_Factory::assignUniqueIdOnCreation(yesno);
+}
+
 bool newUMLObjectWasCreated() {
     return bNewUMLObjectWasCreated;
 }
@@ -145,7 +149,7 @@
                         parentPkg = static_cast<UMLPackage*>(o);
                         continue;
                     }
-                    int wantNamespace = 1;
+                    int wantNamespace = KMessageBox::Yes;
                     /* We know std and Qt are always a namespaces */
                     if (scopeName != "std" && scopeName != "Qt") {
                         wantNamespace = KMessageBox::questionYesNo(NULL,
@@ -220,7 +224,7 @@
 }
 
 UMLOperation* makeOperation(UMLClassifier *parent, const QString &name) {
-    UMLOperation *op = new UMLOperation(parent, name);
+    UMLOperation *op = Object_Factory::createOperation(parent, name);
     return op;
 }
 
@@ -304,7 +308,7 @@
         typeObj = createUMLObject(Uml::ot_UMLObject, type, owner);
         bPutAtGlobalScope = false;
     }
-    UMLAttribute *attr = new UMLAttribute(method, name);
+    UMLAttribute *attr = Object_Factory::createAttribute(method, name);
     attr->setType(typeObj);
     method->addParm(attr);
     return attr;
--- trunk/KDE/kdesdk/umbrello/umbrello/import_utils.h #505043:505044
@@ -50,6 +50,15 @@
     void putAtGlobalScope(bool yesno);
 
     /**
+     * Control whether the creation methods solicit a new unique ID for the
+     * created object.
+     * By default, unique ID generation is turned on.
+     *
+     * @param yesno   False turns UID generation off, true turns it on.
+     */
+    void assignUniqueIdOnCreation(bool yesno);
+
+    /**
      * Create a UMLAttribute and insert it into the document.
      */
     UMLObject* insertAttribute(UMLClassifier *klass, Uml::Visibility scope, QString name,
--- trunk/KDE/kdesdk/umbrello/umbrello/uml.cpp #505043:505044
@@ -651,7 +651,11 @@
 
     } else {
         KUrl url=KFileDialog::getOpenURL(":open-umbrello-file",
-                                         i18n("*.xmi *.xmi.tgz *.xmi.tar.bz2|All Supported Files (*.xmi, *.xmi.tgz, *.xmi.tar.bz2)\n*.xmi|Uncompressed XMI Files (*.xmi)\n*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)"), this, i18n("Open File"));
+            i18n("*.xmi *.xmi.tgz *.xmi.tar.bz2 *.mdl|All Supported Files (*.xmi, *.xmi.tgz, *.xmi.tar.bz2, *.mdl)\n"
+                 "*.xmi|Uncompressed XMI Files (*.xmi)\n"
+                 "*.xmi.tgz|Gzip Compressed XMI Files (*.xmi.tgz)\n"
+                 "*.xmi.tar.bz2|Bzip2 Compressed XMI Files (*.xmi.tar.bz2)\n"
+                 "*.mdl|Rose model files"), this, i18n("Open File"));
         if(!url.isEmpty()) {
             if(m_doc->openDocument(url))
                 fileOpenRecent->addURL( url );
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.cpp #505043:505044
@@ -59,6 +59,7 @@
 #include "stereotype.h"
 #include "classifierlistitem.h"
 #include "object_factory.h"
+#include "import_rose.h"
 #include "model_utils.h"
 #include "widget_utils.h"
 #include "uml.h"
@@ -487,7 +488,10 @@
             newDocument();
             return false;
         }
-        status = loadFromXMI( file, ENC_UNKNOWN );
+        if (filetype.endsWith(".mdl"))
+            status = Import_Rose::loadFromMDL(file);
+        else
+            status = loadFromXMI( file, ENC_UNKNOWN );
     }
 
     file.close();
--- trunk/KDE/kdesdk/umbrello/umbrello/umldoc.h #505043:505044
@@ -814,12 +814,12 @@
      */
     bool loadFolderFile(QString filename);
 
-private:
     /**
      * Type resolution pass.
      */
     void resolveTypes();
 
+private:
     /**
      * Remove this association from concepts list. This might be
      * a public method if removeAssociation is removed.