[Uml-devel] kdesdk/umbrello/umbrello

[Brian Thomas]

CVS commit by thomas: 

codeoperation should implement updateContent (rather than be pure virtual) as 'empty' method. In general, inheriting class has no need to implement this.


  M +6 -2      codeoperation.cpp   1.7
  M +1 -1      codeoperation.h   1.4
  M +0 -5      codegenerators/javacodeoperation.cpp   1.6
  M +0 -1      codegenerators/javacodeoperation.h   1.3


--- kdesdk/umbrello/umbrello/codeoperation.h  #1.3:1.4
@@ -106,5 +106,5 @@ protected:
 
         virtual void updateMethodDeclaration() = 0;
-        virtual void updateContent() = 0;
+        virtual void updateContent();
 
 private:

--- kdesdk/umbrello/umbrello/codeoperation.cpp  #1.6:1.7
@@ -155,4 +153,10 @@ void CodeOperation::init (UMLOperation *
 
 }
+
+void CodeOperation::updateContent() {
+        // Empty. Unlike codeaccessor methods for most (all?) languages
+        // we dont auto-generate content for operations
+}
+
 
 #include "codeoperation.moc"

--- kdesdk/umbrello/umbrello/codegenerators/javacodeoperation.cpp  #1.5:1.6
@@ -77,9 +77,4 @@ void JavaCodeOperation::setAttributesFro
 }
 
-// we set the body of the operation here
-void JavaCodeOperation::updateContent() {
-        // empty. Dont auto-generate content for operations
-}
-
 // we basically want to update the doc and start text of this method
 void JavaCodeOperation::updateMethodDeclaration()

--- kdesdk/umbrello/umbrello/codegenerators/javacodeoperation.h  #1.2:1.3
@@ -65,5 +65,4 @@ protected:
 
         void updateMethodDeclaration();
-        void updateContent();
 
 private: