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

Author: tfmorris
Date: 2007-11-04 12:13:50-0700
New Revision: 13720

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

Log:
Issue 4890 - Allow recognizers to do the work of deciding which elements are appropriate

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=13720&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=13719&r2=13720
==============================================================================
--- 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 12:13:50-0700
@@ -49,11 +49,10 @@
      */
     public void buildModel() {
         Object target = getTarget();
-        if (target != null 
-                && (Model.getFacade().isAGeneralizableElement(target)
-                || Model.getFacade().isAOperation(target)
-                || Model.getFacade().isAReception(target))) {
+        if (target != null && Model.getFacade().isAUMLElement(target)) {
             setSelected(Model.getFacade().isAbstract(target));
+        } else {
+            setSelected(false);
         }
     }
 

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=13720&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=13719&r2=13720
==============================================================================
--- 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 12:13:50-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -48,12 +48,10 @@
      */
     public void buildModel() {
         Object target = getTarget();
-        if (target != null 
-                && (Model.getFacade().isAGeneralizableElement(target)
-                        || Model.getFacade().isAOperation(target)
-                        || Model.getFacade().isAAssociation(target)
-                        || Model.getFacade().isAReception(target))) {
+        if (target != null && Model.getFacade().isAUMLElement(target)) {
             setSelected(Model.getFacade().isLeaf(target));
+        } else {
+            setSelected(false);
         }
     }
 

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementRootCheckBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementRootCheckBox.java?view=diff&rev=13720&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementRootCheckBox.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementRootCheckBox.java&r1=13719&r2=13720
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementRootCheckBox.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementRootCheckBox.java	2007-11-04 12:13:50-0700
@@ -47,8 +47,11 @@
      * @see org.argouml.uml.ui.UMLCheckBox2#buildModel()
      */
     public void buildModel() {
-        if (getTarget() != null) {
-            setSelected(Model.getFacade().isRoot(getTarget()));
+        Object target = getTarget();
+        if (target != null && Model.getFacade().isAUMLElement(target)) {
+            setSelected(Model.getFacade().isRoot(target));
+        } else {
+            setSelected(false);
         }
     }