[Uml-devel] branches/KDE/3.5/kdesdk/umbrello/umbrello

[Oliver Kellogg]

SVN commit 503042 by okellogg:

Rose import, take 1: Define an internal representation (the PetalNode)
and parse MDL files into this representation.
Up next: Walk the PetalNode tree for building Umbrello objects.
CCBUG:81364


 M  +2 -0      Makefile.am  
 A             import_rose.cpp   [License: GPL (v2+)]
 A             import_rose.h   [License: no copyright]
 A             petalnode.cpp   [License: GPL (v2+)]
 A             petalnode.h   [License: GPL (v2+)]
 M  +5 -1      uml.cpp  
 M  +5 -1      umldoc.cpp  


--- branches/KDE/3.5/kdesdk/umbrello/umbrello/Makefile.am #503041:503042
@@ -51,6 +51,7 @@
 kplayerslideraction.cpp \
 hierarchicalcodeblock.cpp \
 idlimport.cpp \
+import_rose.cpp \
 import_utils.cpp \
 infowidget.cpp \
 javaimport.cpp \
@@ -72,6 +73,7 @@
 ownedhierarchicalcodeblock.cpp \
 package.cpp \
 packagewidget.cpp \
+petalnode.cpp \
 plugin.cpp \
 pluginloader.cpp \
 pythonimport.cpp \
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #503041:503042
@@ -682,7 +682,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 );
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umldoc.cpp #503041:503042
@@ -60,6 +60,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"
@@ -496,7 +497,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();