[Uml-devel] kdesdk/umbrello/umbrello/codegenerators

Brian Thomas thomas at mail630.gsfc.nasa.gov
Fri Oct 3 13:49:04 UTC 2003


CVS commit by thomas: 

combine functionality of java{add|remove|get|set|list}codeaccessormethod classes in one class for easier maintenance. NewCodeAccessorMethod altered to match reality.


  M +3 -33     javaclassifiercodedocument.cpp   1.15


--- kdesdk/umbrello/umbrello/codegenerators/javaclassifiercodedocument.cpp  #1.14:1.15
@@ -24,5 +24,4 @@
 */
 #include <kdebug.h>
-#include <kdebug.h>
 #include <qregexp.h>
 
@@ -32,9 +31,5 @@
 #include "javaclassdeclarationblock.h"
 #include "javacodeclassfielddeclarationblock.h"
-#include "javagetaccessormethod.h"
-#include "javasetaccessormethod.h"
-#include "javaaddaccessormethod.h"
-#include "javaremoveaccessormethod.h"
-#include "javalistaccessormethod.h"
+#include "javacodeaccessormethod.h"
 #include "javacodeoperation.h"
 
@@ -183,31 +178,6 @@ CodeComment * JavaClassifierCodeDocument
  */
 CodeAccessorMethod * JavaClassifierCodeDocument::newCodeAccessorMethod( CodeClassField *cf, CodeAccessorMethod::AccessorType type ) {
-        CodeAccessorMethod * method = (CodeAccessorMethod*) NULL;
-        switch (type) {
-                case CodeAccessorMethod::GET:
-                        method = new JavaGetAccessorMethod((JavaCodeClassField*)cf);
-                        method->setOverallIndentationLevel(1);
-                        break;
-                case CodeAccessorMethod::SET:
-                        method = new JavaSetAccessorMethod((JavaCodeClassField*)cf);
-                        method->setOverallIndentationLevel(1);
-                        break;
-                case CodeAccessorMethod::LIST:
-                        method = new JavaListAccessorMethod((JavaCodeClassField*)cf);
-                        method->setOverallIndentationLevel(1);
-                        break;
-                case CodeAccessorMethod::REMOVE:
-                        method = new JavaRemoveAccessorMethod((JavaCodeClassField*)cf);
-                        method->setOverallIndentationLevel(1);
-                        break;
-                case CodeAccessorMethod::ADD:
-                        method = new JavaAddAccessorMethod((JavaCodeClassField*)cf);
+        CodeAccessorMethod * method = new JavaCodeAccessorMethod((JavaCodeClassField*)cf, type);
                         method->setOverallIndentationLevel(1);
-                        break;
-                default:
-                        // perhaps this is a fatal condition??
-                        kdWarning()<<"Error: cannot make accessor method with type:"<<type<<endl;
-                        break;
-        }
         return method;
 }






More information about the umbrello-devel mailing list