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

[Oliver Kellogg]

SVN commit 635308 by okellogg:

Add C# code generator by Ferenc Veres, see
http://www.geeksoc.org/~jr/umbrello/uml-devel/10058.html
Still work in progress - his comments no. 3 to 11 are not yet solved.
Perhaps somebody in the know of C# could help out.
CCBUG:53368


 M  +2 -1      ChangeLog  
 M  +1 -0      THANKS  
 M  +1 -1      umbrello/codegenerators/Makefile.am  
 M  +4 -4      umbrello/codegenerators/codegenfactory.cpp  
 A             umbrello/codegenerators/csharpwriter.cpp   [License: UNKNOWN]
 A             umbrello/codegenerators/csharpwriter.h   [License: UNKNOWN]
 M  +4 -4      umbrello/model_utils.cpp  
 M  +2 -0      umbrello/uml.cpp  
 M  +1 -1      umbrello/umlnamespace.h  


--- branches/KDE/3.5/kdesdk/umbrello/ChangeLog #635307:635308
@@ -1,6 +1,7 @@
 Version 1.5.7
 
-* Bugs fixed from http://bugs.kde.org:
+* Bugs/wishes from http://bugs.kde.org:
+* C# Code Generation and export (53368)
 * %date% and %time% not being parsed (96612)
 * Relationships for entities do not live outside of the diagram (125146)
 * Javascript wrong Code Generation (135527)
--- branches/KDE/3.5/kdesdk/umbrello/THANKS #635307:635308
@@ -77,6 +77,7 @@
 Andrew Sutton <asutton @cs.kent.edu>
 Tanuj <tagrawal @hss.hns.com>
 Brian Thomas <brian.thomas @gsfc.nasa.gov>
+Ferenc Veres <lion @netngine.hu>
 Jean Vittor <jean.vittor @wanadoo.fr>
 Egbert Voigt <Egbert.Voigt @alcatel.de>
 Stefan Walter <sw @gegenunendlich.de>
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/codegenerators/Makefile.am #635307:635308
@@ -27,7 +27,7 @@
 	rubycodegenerationpolicy.cpp rubycodegenerationpolicypage.cpp \
 	rubycodegenerationformbase.ui \
 	simplecodegenerator.cpp \
-	adawriter.cpp aswriter.cpp cppwriter.cpp javawriter.cpp jswriter.cpp \
+	adawriter.cpp aswriter.cpp cppwriter.cpp csharpwriter.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 #635307:635308
@@ -34,7 +34,7 @@
 
 #include "adawriter.h"
 #include "cppwriter.h"
-// #include "cswriter.h" // missing in action?!?
+#include "csharpwriter.h"
 #include "idlwriter.h"
 #include "javawriter.h"
 #include "pascalwriter.h"
@@ -102,9 +102,9 @@
             else
                 obj = new CppWriter();
             break;
-        // case Uml::pl_Csharp:
-        //     obj = new CsWriter();
-        //     break;
+        case Uml::pl_CSharp:
+            obj = new CSharpWriter();
+            break;
         case Uml::pl_IDL:
             obj = new IDLWriter();
             break;
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/model_utils.cpp #635307:635308
@@ -570,8 +570,8 @@
             return "Ada";
         case Uml::pl_Cpp:
             return "C++";
-        // case Uml::pl_Csharp:
-            // return "C#";
+        case Uml::pl_CSharp:
+            return "C#";
         case Uml::pl_IDL:
             return "IDL";
         case Uml::pl_Java:
@@ -609,8 +609,8 @@
         return Uml::pl_Ada;
     if (str == "C++" || str == "Cpp")  // "Cpp" only for bkwd compatibility
         return Uml::pl_Cpp;
-    // if (str == "C#")
-        // return Uml::pl_Csharp;
+    if (str == "C#")
+        return Uml::pl_CSharp;
     if (str == "IDL")
         return Uml::pl_IDL;
     if (str == "Java")
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/uml.cpp #635307:635308
@@ -457,6 +457,7 @@
 
     m_listDock = createDockWidget( "Model", 0L, 0L, i18n("&Tree View") );
     m_listView = new UMLListView(m_listDock ,"LISTVIEW");
+    //m_listView->setSorting(-1);
     m_listView->setDocument(m_doc);
     m_listView->init();
     m_listDock->setWidget(m_listView);
@@ -1313,6 +1314,7 @@
 QString UMLApp::activeLanguageScopeSeparator() {
     Uml::Programming_Language pl = getActiveLanguage();
     if (pl == Uml::pl_Ada ||
+        pl == Uml::pl_CSharp ||
         pl == Uml::pl_Pascal ||
         pl == Uml::pl_Java ||
         pl == Uml::pl_JavaScript ||
--- branches/KDE/3.5/kdesdk/umbrello/umbrello/umlnamespace.h #635307:635308
@@ -308,7 +308,7 @@
     pl_ActionScript,
     pl_Ada,
     pl_Cpp,
-    // pl_Csharp,
+    pl_CSharp,
     pl_IDL,
     pl_Java,
     pl_JavaScript,