svn commit: r15723 - trunk/src/argouml-app/src/org/argouml/uml/ui

Author: mvw
Date: 2008-09-16 13:19:50-0700
New Revision: 15723

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java
   trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java

Log:
The solution to issue 5395: Exception when creating new sequence diagram.

This was caused by my commit 15720, done for issue 5393.

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java?view=diff&rev=15723&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java&r1=15722&r2=15723
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionNewDiagram.java	2008-09-16 13:19:50-0700
@@ -148,7 +148,8 @@
      */
     protected static Object createCollaboration(Object namespace) {
         Object target = TargetManager.getInstance().getModelTarget();
-        if (Model.getModelManagementHelper().isReadOnly(target)) {
+            if (Model.getFacade().isAUMLElement(target) 
+                    && Model.getModelManagementHelper().isReadOnly(target)) {
             target = namespace;
         }
         Object collaboration = null;

Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java?view=diff&rev=15723&p1=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java&p2=trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java&r1=15722&r2=15723
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionStateDiagram.java	2008-09-16 13:19:50-0700
@@ -49,7 +49,8 @@
      */
     protected ArgoDiagram createDiagram(Object namespace) {
         Object target = TargetManager.getInstance().getModelTarget();
-        if (Model.getModelManagementHelper().isReadOnly(target)) {
+        if (Model.getFacade().isAUMLElement(target) 
+                && Model.getModelManagementHelper().isReadOnly(target)) {
             target = namespace;
         }
         Object machine = null;