svn commit: r13347 - trunk/src_new/org/argouml/kernel/ProjectImpl.java

Author: tfmorris
Date: 2007-08-14 11:08:50-0700
New Revision: 13347

Modified:
   trunk/src_new/org/argouml/kernel/ProjectImpl.java

Log:
Apply Michiel's patch to check for project being deleted before creating new default diagram

Modified: trunk/src_new/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/kernel/ProjectImpl.java?view=diff&rev=13347&p1=trunk/src_new/org/argouml/kernel/ProjectImpl.java&p2=trunk/src_new/org/argouml/kernel/ProjectImpl.java&r1=13346&r2=13347
==============================================================================
--- trunk/src_new/org/argouml/kernel/ProjectImpl.java	(original)
+++ trunk/src_new/org/argouml/kernel/ProjectImpl.java	2007-08-14 11:08:50-0700
@@ -380,14 +380,16 @@
      */
     protected void removeProjectMemberDiagram(ArgoDiagram d) {
         if (activeDiagram == d) {
-            ArgoDiagram defaultDiagram;
+            ArgoDiagram defaultDiagram = null;
             if (diagrams.size() == 1) {
                 // We're deleting the last diagram so lets create a new one
                 // TODO: Once we go MDI we won't need this.
-                defaultDiagram =
-                    DiagramFactory.getInstance().createDefaultDiagram(
-                            getRoot());
-                addMember(defaultDiagram);
+                Object projectRoot = getRoot();
+                if (!Model.getUmlFactory().isRemoved(projectRoot)) {
+                    defaultDiagram = DiagramFactory.getInstance()
+                            .createDefaultDiagram(projectRoot);
+                    addMember(defaultDiagram);
+                }
             } else {
                 // Make the topmost diagram (that is not the one being deleted)
                 // current.