svn commit: r17012 - trunk/src/argouml-app/src/org/argouml/uml: diagram/ui ui/foundation/core

Author: tfmorris
Date: 2009-04-01 08:34:18-0700
New Revision: 17012

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java

Log:
Protect some places where deleted elements cause problems

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=17012&r1=17011&r2=17012
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2009-04-01 08:34:18-0700
@@ -1135,7 +1135,11 @@
      * @return The model element is read only.
      */
     private boolean isReadOnly() {
-        return Model.getModelManagementHelper().isReadOnly(getOwner());
+        try {
+            return Model.getModelManagementHelper().isReadOnly(getOwner());
+        } catch (InvalidElementException e) {
+            return true;
+        }
     }
 
     /**

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java?view=diff&pathrev=17012&r1=17011&r2=17012
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java	2009-04-01 08:34:18-0700
@@ -40,6 +40,7 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.UmlModelMutator;
+import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.ui.PropPanel;
@@ -159,8 +160,12 @@
         super.setTarget(target);
         /* This for e.g. a CommentEdge: */
         if (Model.getFacade().isAUMLElement(target)) {
-            boolean enable =
-                !Model.getModelManagementHelper().isReadOnly(target);
+            boolean enable = false;
+            try {
+                enable = !Model.getModelManagementHelper().isReadOnly(target);
+            } catch (InvalidElementException e) {
+                // enable remains false if this element was deleted
+            }
             for (final Component component : getComponents()) {
                 if (component instanceof JScrollPane) {
                     Component c =

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1508092

To unsubscribe from this discussion, e-mail: [[email protected]].