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

[Oliver Kellogg]

SVN commit 671591 by okellogg:

Partial backport of r670997 from trunk.
Does not include the advanced code generator as that is blocked by bug 126262.
BUG:124805


 M  +1 -0      ChangeLog  
 M  +1 -0      THANKS  
 M  +3 -2      umbrello/attribute.cpp  
 M  +1 -1      umbrello/codegenerators/Makefile.am  
 M  +4 -0      umbrello/codegenerators/codegenfactory.cpp  
 A             umbrello/codegenerators/dwriter.cpp   [License: GPL (v2+)]
 A             umbrello/codegenerators/dwriter.h   [License: GPL (v2+)]
 M  +1 -0      umbrello/headings/Makefile.am  
 A             umbrello/headings/heading.d  
 M  +2 -0      umbrello/model_utils.cpp  
 M  +1 -0      umbrello/umlnamespace.h  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #671590:671591
@@ -2,6 +2,7 @@
 
 * Bugs/wishes from http://bugs.kde.org:
 * Preprocessor keywords ignored which causes endless loop in code import (119125)
+* Code generator for D language (124805)
 * Unstable saves and loads, class names become dirty (145709)
 * Crash on deleting class in list view (145762)
 * Class attribute documentation not generated for python (145916)
--- branches/KDE/3.5/kdesdk/umbrello/THANKS #671590:671591
@@ -49,6 +49,7 @@
 Piotr Kolaczkowski <P.Kolaczkowski @elka.pw.edu.pl>
 Matthias Kretz <kretz @kde.org>
 Thorsten Kunz <tk @bytecrash.net>
+Jari-Matti Mäkelä <jmjm @iki.fi>
 Gustavo Madrigal <gmadrigal @nextphere.com>
 martin <mv123q3 @hotmail.com>
 Rene Meyer <Rene.Meyer @sturmit.de>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/attribute.cpp #671590:671591
@@ -299,8 +299,9 @@
     UMLClassifierList templateParamList;
     QString type = getType()->getName();
     QString templateParam;
-    //template and generic only in C++ and Java ?
-    if (UMLApp::app()->getActiveLanguage() == Uml::pl_Cpp || UMLApp::app()->getActiveLanguage() == Uml::pl_Java) {
+    // Handle C++/D/Java template/generic parameters
+    const Uml::Programming_Language pl = UMLApp::app()->getActiveLanguage();
+    if (pl == Uml::pl_Cpp || pl == Uml::pl_Java || pl == Uml::pl_D) {
         int start = type.find(QChar('<'));
         if (start >= 0 ) {
             int end = type.findRev(QChar('>'));
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/Makefile.am #671590:671591
@@ -27,7 +27,7 @@
 	rubycodegenerationpolicy.cpp rubycodegenerationpolicypage.cpp \
 	rubycodegenerationformbase.ui \
 	simplecodegenerator.cpp \
-	adawriter.cpp aswriter.cpp cppwriter.cpp csharpwriter.cpp javawriter.cpp jswriter.cpp \
+	adawriter.cpp aswriter.cpp cppwriter.cpp csharpwriter.cpp dwriter.cpp javawriter.cpp jswriter.cpp \
 	idlwriter.cpp pascalwriter.cpp perlwriter.cpp php5writer.cpp phpwriter.cpp \
 	pythonwriter.cpp rubywriter.cpp sqlwriter.cpp tclwriter.cpp xmlschemawriter.cpp \
 	xmlelementcodeblock.cpp xmlcodecomment.cpp \
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/codegenfactory.cpp #671590:671591
@@ -34,6 +34,7 @@
 #include "adawriter.h"
 #include "cppwriter.h"
 #include "csharpwriter.h"
+#include "dwriter.h"
 #include "idlwriter.h"
 #include "javawriter.h"
 #include "pascalwriter.h"
@@ -116,6 +117,9 @@
         case Uml::pl_CSharp:
             obj = new CSharpWriter();
             break;
+        case Uml::pl_D:
+            obj = new DWriter();
+            break;
         case Uml::pl_IDL:
             obj = new IDLWriter();
             break;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/headings/Makefile.am #671590:671591
@@ -4,6 +4,7 @@
 heading.as \
 heading.cpp \
 heading.cs \
+heading.d \
 heading.h \
 heading.idl \
 heading.java \
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/model_utils.cpp #671590:671591
@@ -572,6 +572,8 @@
             return "C++";
         case Uml::pl_CSharp:
             return "C#";
+        case Uml::pl_D:
+            return "D";
         case Uml::pl_IDL:
             return "IDL";
         case Uml::pl_Java:
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlnamespace.h #671590:671591
@@ -309,6 +309,7 @@
     pl_Ada,
     pl_Cpp,
     pl_CSharp,
+    pl_D,
     pl_IDL,
     pl_Java,
     pl_JavaScript,