[Uml-devel] kdesdk/umbrello

[Oliver Kellogg]

CVS commit by okellogg: 

Resolve bugs.kde.org/90755.


  M +1 -1      ChangeLog   1.38
  M +10 -1     umbrello/dialogs/umloperationdialog.cpp   1.36


--- kdesdk/umbrello/ChangeLog  #1.37:1.38
@@ -10,5 +10,5 @@
 62321       80405 80559 82342 85377 86083 86952 86958 87111
 87537 87995 88152 88245 88415 88954 89334 89553 89579 89582
-89699 89903 90102 
+89699 89903 90102 90755
 
 

--- kdesdk/umbrello/umbrello/dialogs/umloperationdialog.cpp  #1.35:1.36
@@ -430,5 +430,14 @@ bool UMLOperationDialog::apply()
                 m_pOperation -> setScope( Uml::Protected );
         m_pOperation -> setTypeName( m_pRtypeCB -> currentText() );
-        m_pOperation -> setAbstract( m_pAbstractCB -> isChecked() );
+        bool isAbstract = m_pAbstractCB->isChecked();
+        m_pOperation -> setAbstract( isAbstract );
+        if (isAbstract) {
+                /* If any operation is abstract then the owning class needs
+                   to be made abstract.
+                   The inverse is not true: The fact that no operation is
+                   abstract does not mean that the class must be non-abstract.
+                 */
+                classifier->setAbstract(true);
+        }
         m_pOperation -> setStatic( m_pStaticCB -> isChecked() );
         m_pOperation -> setStereotype( m_pStereoTypeLE->text() );