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

Author: tfmorris
Date: 2007-06-08 00:45:19-0700
New Revision: 12776

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

Log:
Check that we have a GeneralizableElement before operating on it

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=12776&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=12775&r2=12776
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementAbstractCheckBox.java	2007-06-08 00:45:19-0700
@@ -48,7 +48,8 @@
      * @see org.argouml.uml.ui.UMLCheckBox2#buildModel()
      */
     public void buildModel() {
-        if (getTarget() != null) {
+        if (getTarget() != null 
+                && Model.getFacade().isAGeneralizableElement(getTarget())) {
             setSelected(Model.getFacade().isAbstract(getTarget()));
         }
     }

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementGeneralizationListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementGeneralizationListModel.java?view=diff&rev=12776&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementGeneralizationListModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementGeneralizationListModel.java&r1=12775&r2=12776
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementGeneralizationListModel.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementGeneralizationListModel.java	2007-06-08 00:45:19-0700
@@ -46,7 +46,8 @@
      * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
      */
     protected void buildModelList() {
-        if (getTarget() != null) {
+        if (getTarget() != null
+                && Model.getFacade().isAGeneralizableElement(getTarget())) {
             setAllElements(Model.getFacade().getGeneralizations(getTarget()));
         }
     }

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=12776&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=12775&r2=12776
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementLeafCheckBox.java	2007-06-08 00:45:19-0700
@@ -47,7 +47,8 @@
      * @see org.argouml.uml.ui.UMLCheckBox2#buildModel()
      */
     public void buildModel() {
-        if (getTarget() != null) {
+        if (getTarget() != null 
+                && Model.getFacade().isAGeneralizableElement(getTarget())) {
             setSelected(Model.getFacade().isLeaf(getTarget()));
         }
     }

Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementSpecializationListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementSpecializationListModel.java?view=diff&rev=12776&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementSpecializationListModel.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementSpecializationListModel.java&r1=12775&r2=12776
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementSpecializationListModel.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/UMLGeneralizableElementSpecializationListModel.java	2007-06-08 00:45:19-0700
@@ -48,7 +48,8 @@
      * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
      */
     protected void buildModelList() {
-        if (getTarget() != null) {
+        if (getTarget() != null &&
+                Model.getFacade().isAGeneralizableElement(getTarget())) {
             setAllElements(Model.getFacade().getSpecializations(getTarget()));
         }
     }