svn commit: r13174 - trunk/src_new/org/argouml/uml/ui

Author: mvw
Date: 2007-07-27 23:30:49-0700
New Revision: 13174

Modified:
   trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java
   trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java
   trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java

Log:
Fix the exception for non-package namespaces. 

Make the sequence2 diagram compile.

Modified: trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java?view=diff&rev=13174&p1=trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java&p2=trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java&r1=13173&r2=13174
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionCollaborationDiagram.java	2007-07-27 23:30:49-0700
@@ -45,7 +45,7 @@
     public ArgoDiagram createDiagram(Object namespace) {
         return DiagramFactory.getInstance().createDiagram(
                 DiagramFactory.DiagramType.Collaboration,
-                createCollaboration(),
+                createCollaboration(namespace),
                 null);
     }
 

Modified: trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java?view=diff&rev=13174&p1=trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java&p2=trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java&r1=13173&r2=13174
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionNewDiagram.java	2007-07-27 23:30:49-0700
@@ -86,17 +86,29 @@
      * @return the new diagram
      */
     protected abstract ArgoDiagram createDiagram(Object namespace);
-    
+
     /**
      * Utility function to create a collaboration.
      * 
      * @return a new collaboration
+     * @deprecated by MVW in V0.25.3. Replaced by 
+     * createCollaboration(Object namespace)
      */
     protected static Object createCollaboration() {
         Project p = ProjectManager.getManager().getCurrentProject();
+        Object namespace = p.getRoot(); // the root model
+        return createCollaboration(namespace);
+    }
+
+    /**
+     * Utility function to create a collaboration.
+     * 
+     * @return a new collaboration
+     * @param namespace the back-up namespace to put the collaboration in
+     */
+    protected static Object createCollaboration(Object namespace) {
         Object target = TargetManager.getInstance().getModelTarget();
         Object collaboration = null;
-        Object namespace = p.getRoot(); // the root model
         if (Model.getFacade().isAOperation(target)) {
             Object ns = Model.getFacade().getNamespace(
                     Model.getFacade().getOwner(target));
@@ -110,6 +122,7 @@
             collaboration =
                 Model.getCollaborationsFactory().createCollaboration();
             if (Model.getFacade().isANamespace(target)) {
+                /* TODO: Not all namespaces are useful here - any WFRs? */
                 namespace = target;
             } else {
                 if (Model.getFacade().isAModelElement(target)) {

Modified: trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java?view=diff&rev=13174&p1=trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java&r1=13173&r2=13174
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java	2007-07-27 23:30:49-0700
@@ -45,7 +45,7 @@
     public ArgoDiagram createDiagram(Object namespace) {
         return DiagramFactory.getInstance().createDiagram(
                 DiagramFactory.DiagramType.Sequence,
-                createCollaboration(),
+                createCollaboration(namespace),
                 null);
     }