svn commit: r13715 - trunk/src_new/org/argouml/uml/ui/foundation/core

Author: penyaskito
Date: 2007-11-04 07:02:43-0700
New Revision: 13715

Modified:
   trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java
   trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java

Log:
Abstract and Leaf checkboxes do not follow target changes. Fixes issue 4890.

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java?view=diff&rev=13715&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java&r1=13714&r2=13715
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java	2007-11-04 07:02:43-0700
@@ -48,9 +48,12 @@
      * @see org.argouml.uml.ui.UMLCheckBox2#buildModel()
      */
     public void buildModel() {
-        if (getTarget() != null 
-                && Model.getFacade().isAGeneralizableElement(getTarget())) {
-            setSelected(Model.getFacade().isAbstract(getTarget()));
+        Object target = getTarget();
+        if (target != null 
+                && (Model.getFacade().isAGeneralizableElement(target)
+                || Model.getFacade().isAOperation(target)
+                || Model.getFacade().isAReception(target))) {
+            setSelected(Model.getFacade().isAbstract(target));
         }
     }
 

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java?view=diff&rev=13715&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java&r1=13714&r2=13715
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java	2007-11-04 07:02:43-0700
@@ -47,9 +47,13 @@
      * @see org.argouml.uml.ui.UMLCheckBox2#buildModel()
      */
     public void buildModel() {
-        if (getTarget() != null 
-                && Model.getFacade().isAGeneralizableElement(getTarget())) {
-            setSelected(Model.getFacade().isLeaf(getTarget()));
+        Object target = getTarget();
+        if (target != null 
+                && (Model.getFacade().isAGeneralizableElement(target)
+                        || Model.getFacade().isAOperation(target)
+                        || Model.getFacade().isAAssociation(target)
+                        || Model.getFacade().isAReception(target))) {
+            setSelected(Model.getFacade().isLeaf(target));
         }
     }