svn commit: r15410 - trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java

Author: tfmorris
Date: 2008-07-30 11:30:30-0700
New Revision: 15410

Modified:
   trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java

Log:
Issue 5245: Improve extent management

Modified: trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java?view=diff&rev=15410&p1=trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java&p2=trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java&r1=15409&r2=15410
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/kernel/ProjectImpl.java	2008-07-30 11:30:30-0700
@@ -46,6 +46,7 @@
 import org.argouml.application.helpers.ApplicationVersion;
 import org.argouml.configuration.Configuration;
 import org.argouml.i18n.Translator;
+import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
 import org.argouml.persistence.PersistenceManager;
 import org.argouml.profile.Profile;
@@ -1067,8 +1068,14 @@
         }
 
         members.clear();
-        Model.getUmlFactory().deleteExtent(roots.iterator().next());
-        roots.clear();
+        if (!roots.isEmpty()) {
+            try {
+                Model.getUmlFactory().deleteExtent(roots.iterator().next());
+            } catch (InvalidElementException e) {
+                LOG.warn("Extent deleted a second time");
+            }
+            roots.clear();
+        }
         models.clear();
         diagrams.clear();
         searchpath.clear();