svn commit: r13898 - trunk: src_new/org/argouml/profile tests/org/argouml/ui tests/org/argouml/ui/cmd tests/org/argouml/uml/ui

Author: euluis
Date: 2007-12-10 17:24:48-0800
New Revision: 13898

Modified:
   trunk/src_new/org/argouml/profile/StreamModelLoader.java
   trunk/tests/org/argouml/ui/GUITestProjectBrowser.java
   trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java
   trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java
   trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java

Log:
Issue #4885: Exposing loadModel(InputStream) to be used by modules. Fixing GUI tests after InitProfileSubsystem dependency cycle removal.

Modified: trunk/src_new/org/argouml/profile/StreamModelLoader.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/profile/StreamModelLoader.java?view=diff&rev=13898&p1=trunk/src_new/org/argouml/profile/StreamModelLoader.java&p2=trunk/src_new/org/argouml/profile/StreamModelLoader.java&r1=13897&r2=13898
==============================================================================
--- trunk/src_new/org/argouml/profile/StreamModelLoader.java	(original)
+++ trunk/src_new/org/argouml/profile/StreamModelLoader.java	2007-12-10 17:24:48-0800
@@ -47,7 +47,7 @@
      * @return the model
      * @throws ProfileException if the XMIReader couldn't read the input stream
      */
-    protected Collection loadModel(InputStream inputStream)
+    public Collection loadModel(InputStream inputStream)
         throws ProfileException {
         
         if (inputStream != null) {

Modified: trunk/tests/org/argouml/ui/GUITestProjectBrowser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/GUITestProjectBrowser.java?view=diff&rev=13898&p1=trunk/tests/org/argouml/ui/GUITestProjectBrowser.java&p2=trunk/tests/org/argouml/ui/GUITestProjectBrowser.java&r1=13897&r2=13898
==============================================================================
--- trunk/tests/org/argouml/ui/GUITestProjectBrowser.java	(original)
+++ trunk/tests/org/argouml/ui/GUITestProjectBrowser.java	2007-12-10 17:24:48-0800
@@ -29,11 +29,11 @@
 import javax.swing.Action;
 
 import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
 
 import org.argouml.cognitive.ui.ToDoPane;
 import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
+import org.argouml.model.InitializeModel;
 import org.argouml.model.Model;
 import org.argouml.ui.cmd.ActionNew;
 import org.argouml.ui.targetmanager.TargetManager;
@@ -67,6 +67,7 @@
     public void setUp() throws Exception {
 	super.setUp();
         InitializeModel.initializeDefault();
+        new org.argouml.profile.internal.InitProfileSubsystem().init();
         SplashScreen splashScreen = new SplashScreen();
         assertNotNull(ProjectBrowser.makeInstance(splashScreen, 
                 true, new ToDoPane(splashScreen)));

Modified: trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java?view=diff&rev=13898&p1=trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java&p2=trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java&r1=13897&r2=13898
==============================================================================
--- trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java	(original)
+++ trunk/tests/org/argouml/ui/cmd/GUITestActionGotoDiagram.java	2007-12-10 17:24:48-0800
@@ -29,8 +29,8 @@
 import java.util.List;
 
 import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
 
+import org.argouml.model.InitializeModel;
 import org.argouml.util.CheckMain;
 
 /**
@@ -52,8 +52,9 @@
      * @see junit.framework.TestCase#setUp()
      */
     public void setUp() throws Exception {
-	super.setUp();
+        super.setUp();
         InitializeModel.initializeDefault();
+        new org.argouml.profile.internal.InitProfileSubsystem().init();
     }
 
     /**

Modified: trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java?view=diff&rev=13898&p1=trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java&p2=trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java&r1=13897&r2=13898
==============================================================================
--- trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java	(original)
+++ trunk/tests/org/argouml/uml/ui/GUITestActionOpenProject.java	2007-12-10 17:24:48-0800
@@ -29,9 +29,9 @@
 import java.util.List;
 
 import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
 
 import org.argouml.kernel.ProjectManager;
+import org.argouml.model.InitializeModel;
 import org.argouml.util.CheckMain;
 
 /**
@@ -51,8 +51,9 @@
      * @see junit.framework.TestCase#setUp()
      */
     public void setUp() throws Exception {
-	super.setUp();
+        super.setUp();
         InitializeModel.initializeDefault();
+        new org.argouml.profile.internal.InitProfileSubsystem().init();
     }
 
     /**

Modified: trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java?view=diff&rev=13898&p1=trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java&p2=trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java&r1=13897&r2=13898
==============================================================================
--- trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java	(original)
+++ trunk/tests/org/argouml/uml/ui/GUITestActionSaveGraphics.java	2007-12-10 17:24:48-0800
@@ -29,8 +29,8 @@
 import java.util.List;
 
 import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
 
+import org.argouml.model.InitializeModel;
 import org.argouml.util.CheckMain;
 
 /**
@@ -53,8 +53,9 @@
      * @see junit.framework.TestCase#setUp()
      */
     public void setUp() throws Exception {
-	super.setUp();
+        super.setUp();
         InitializeModel.initializeDefault();
+        new org.argouml.profile.internal.InitProfileSubsystem().init();
     }
 
     /**