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

Author: mvw
Date: 2008-08-11 12:01:52-0700
New Revision: 15550

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

Log:
A ClassCastException exception occurred when selecting a comment-edge between 2 elements from a profile on a diagram (in my test case an object and its comment).

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&rev=15550&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java&r1=15549&r2=15550
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java	2008-08-11 12:01:52-0700
@@ -724,7 +724,11 @@
      * @return The model element is read only.
      */
     private boolean isReadOnly() {
-        return Model.getModelManagementHelper().isReadOnly(getOwner());
+        Object owner = getOwner();
+        if (Model.getFacade().isAUMLElement(owner)) {
+            return Model.getModelManagementHelper().isReadOnly(owner);
+        }
+        return false;
     }
 
     

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&rev=15550&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/foundation/core/PropPanelModelElement.java&r1=15549&r2=15550
==============================================================================
--- 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	2008-08-11 12:01:52-0700
@@ -182,12 +182,15 @@
      */
     public void setTarget(Object target) {
         super.setTarget(target);
-        boolean enable =
-            !Model.getModelManagementHelper().isReadOnly(target);
-        for (final Component component : getComponents()) {
-            if (!(component instanceof JLabel)
-                    && component.isEnabled() != enable) {
-                component.setEnabled(enable);
+        /* This for e.g. a CommentEdge: */
+        if (Model.getFacade().isAUMLElement(target)) {
+            boolean enable =
+                !Model.getModelManagementHelper().isReadOnly(target);
+            for (final Component component : getComponents()) {
+                if (!(component instanceof JLabel)
+                        && component.isEnabled() != enable) {
+                    component.setEnabled(enable);
+                }
             }
         }
     }