svn commit: r13777 - trunk/tests/org/argouml/model/InitializeModel.java

Author: tfmorris
Date: 2007-11-15 18:47:36-0800
New Revision: 13777

Modified:
   trunk/tests/org/argouml/model/InitializeModel.java

Log:
Revert some of the dependency changes until the Ant build can be fixed.

Modified: trunk/tests/org/argouml/model/InitializeModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/model/InitializeModel.java?view=diff&rev=13777&p1=trunk/tests/org/argouml/model/InitializeModel.java&p2=trunk/tests/org/argouml/model/InitializeModel.java&r1=13776&r2=13777
==============================================================================
--- trunk/tests/org/argouml/model/InitializeModel.java	(original)
+++ trunk/tests/org/argouml/model/InitializeModel.java	2007-11-15 18:47:36-0800
@@ -37,7 +37,7 @@
      * The default model implementation to start.
      */
     private static final String DEFAULT_MODEL_IMPLEMENTATION =
-        org.argouml.model.mdr.MDRModelImplementation.class.toString();
+        "org.argouml.model.mdr.MDRModelImplementation";
 
 
     /**
@@ -62,11 +62,10 @@
 
     /**
      * Initialize the Model subsystem with the MDR ModelImplementation.
-     * @throws UmlException 
      */
-    public static void initializeMDR() throws UmlException {
-        Model.setImplementation(
-                new org.argouml.model.mdr.MDRModelImplementation());
+    public static void initializeMDR() {
+        initializeModelImplementation(
+                "org.argouml.model.mdr.MDRModelImplementation");
     }
 
     /**
@@ -75,10 +74,9 @@
      * @return the newly created MockModelImplementation.
      */
     public static MockModelImplementation initializeMock() {
-        MockModelImplementation impl = 
-            new org.argouml.model.MockModelImplementation();
-        Model.setImplementation(impl);
-        return impl;
+        return (MockModelImplementation)
+            initializeModelImplementation(
+                "org.argouml.model.MockModelImplementation");
     }
 
     private static ModelImplementation initializeModelImplementation(