svn commit: r13767 - trunk/tests: . org/argouml/model

Author: tfmorris
Date: 2007-11-15 14:05:19-0800
New Revision: 13767

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

Log:
Make dependency explicit rather than hiding using reflection

Modified: trunk/tests/.classpath
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/.classpath?view=diff&rev=13767&p1=trunk/tests/.classpath&p2=trunk/tests/.classpath&r1=13766&r2=13767
==============================================================================
--- trunk/tests/.classpath	(original)
+++ trunk/tests/.classpath	2007-11-15 14:05:19-0800
@@ -6,6 +6,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/argouml-core-model"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/argouml-core-lib"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/argouml-core-tools"/>
-	<classpathentry kind="lib" path="/argouml-core-tools/jdepend-2.9/lib/jdepend-2.9.jar" sourcepath="/argouml-core-tools/jdepend-2.9/src/"/>
+	<classpathentry kind="lib" path="/argouml-core-tools/jdepend-2.9/lib/jdepend-2.9.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/argouml-core-model-mdr"/>
 	<classpathentry kind="output" path="build-eclipse"/>
 </classpath>

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=13767&p1=trunk/tests/org/argouml/model/InitializeModel.java&p2=trunk/tests/org/argouml/model/InitializeModel.java&r1=13766&r2=13767
==============================================================================
--- trunk/tests/org/argouml/model/InitializeModel.java	(original)
+++ trunk/tests/org/argouml/model/InitializeModel.java	2007-11-15 14:05:19-0800
@@ -37,7 +37,7 @@
      * The default model implementation to start.
      */
     private static final String DEFAULT_MODEL_IMPLEMENTATION =
-        "org.argouml.model.mdr.MDRModelImplementation";
+        org.argouml.model.mdr.MDRModelImplementation.class.toString();
 
 
     /**
@@ -62,10 +62,11 @@
 
     /**
      * Initialize the Model subsystem with the MDR ModelImplementation.
+     * @throws UmlException 
      */
-    public static void initializeMDR() {
-        initializeModelImplementation(
-                "org.argouml.model.mdr.MDRModelImplementation");
+    public static void initializeMDR() throws UmlException {
+        Model.setImplementation(
+                new org.argouml.model.mdr.MDRModelImplementation());
     }
 
     /**
@@ -74,9 +75,10 @@
      * @return the newly created MockModelImplementation.
      */
     public static MockModelImplementation initializeMock() {
-        return (MockModelImplementation)
-            initializeModelImplementation(
-                "org.argouml.model.MockModelImplementation");
+        MockModelImplementation impl = 
+            new org.argouml.model.MockModelImplementation();
+        Model.setImplementation(impl);
+        return impl;
     }
 
     private static ModelImplementation initializeModelImplementation(