svn commit: r16954 - trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java

Author: tfmorris
Date: 2009-03-26 11:11:39-0700
New Revision: 16954

Modified:
   trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java

Log:
Catch exception on deleted elements.  Add deprecated annotations.

Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java?view=diff&pathrev=16954&r1=16953&r2=16954
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java	(original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/ModelManagementFactoryMDRImpl.java	2009-03-26 11:11:39-0700
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2008 The Regents of the University of California. All
+// Copyright (c) 2005-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -24,6 +24,8 @@
 
 package org.argouml.model.mdr;
 
+import javax.jmi.reflect.InvalidObjectException;
+
 import org.apache.log4j.Logger;
 import org.argouml.model.ModelManagementFactory;
 import org.omg.uml.foundation.core.ModelElement;
@@ -91,9 +93,15 @@
         if (umlPackage == null) {
             return null;
         }
-        return umlPackage.getModelManagement();
+        try {
+            return umlPackage.getModelManagement();
+        } catch (InvalidObjectException e) {
+            return null;
+        }
     }
     
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public void setRootModel(Object rootModel) {
         if (rootModel != null && !(rootModel instanceof Model)) {
             throw new IllegalArgumentException(
@@ -104,6 +112,8 @@
     }
 
 
+    @SuppressWarnings("deprecation")
+    @Deprecated
     public Object getRootModel() {
         return theRootModel;
     }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1433228

To unsubscribe from this discussion, e-mail: [[email protected]].