Author: mvw
Date: 2007-06-19 14:04:32-0700
New Revision: 12882
Modified:
trunk/tests/org/argouml/TestDependencies.java
trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
trunk/tests/org/argouml/persistence/TestZargoFilePersister.java
trunk/tests/org/argouml/ui/TestPropertyPanels.java
trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java
trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
Log:
Remove dependency from org.argouml.ui on org.argouml.notation.ui, in casu dependency from GUI on SettingsTabNotation.
This change allows subsystems to be initialised by e.g. Main, which then can couple the View to the Model (according the MVC pattern).
Modified: trunk/tests/org/argouml/TestDependencies.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/TestDependencies.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/TestDependencies.java&p2=trunk/tests/org/argouml/TestDependencies.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/TestDependencies.java (original)
+++ trunk/tests/org/argouml/TestDependencies.java 2007-06-19 14:04:32-0700
@@ -148,6 +148,7 @@
//TODO:{"org.argouml.ui", "org.argouml.cognitive.ui"},
//TODO:{"org.argouml.cognitive", "org.argouml.cognitive.critics"},
{"org.argouml.uml.diagram", "org.argouml.ui"},
+ {"org.argouml.ui", "org.argouml.notation.ui"},
};
for (int i = 0; i < dep.length; i++) {
suite.addTest(new CheckNoDependency(jdepend, dep[i]));
Modified: trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java 2007-06-19 14:04:32-0700
@@ -31,12 +31,12 @@
import java.util.List;
import junit.framework.TestCase;
-import org.argouml.model.InitializeModel;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
+import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
-import org.argouml.notation.NotationProviderFactory2;
+import org.argouml.notation.InitNotation;
import org.argouml.notation.providers.NotationProvider;
/**
@@ -115,7 +115,7 @@
* @see junit.framework.TestCase#setUp()
*/
protected void setUp() {
- NotationProviderFactory2.getInstance();
+ (new InitNotation()).init();
}
/**
Modified: trunk/tests/org/argouml/persistence/TestZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/persistence/TestZargoFilePersister.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/persistence/TestZargoFilePersister.java&p2=trunk/tests/org/argouml/persistence/TestZargoFilePersister.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/persistence/TestZargoFilePersister.java (original)
+++ trunk/tests/org/argouml/persistence/TestZargoFilePersister.java 2007-06-19 14:04:32-0700
@@ -30,14 +30,22 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.argouml.model.InitializeModel;
import org.argouml.kernel.Project;
+import org.argouml.model.InitializeModel;
+import org.argouml.notation.InitNotation;
/**
* Testcase to load projects without exception.
*/
public class TestZargoFilePersister extends TestCase {
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ (new InitNotation()).init();
+ }
+
/**
* The constructor.
*
Modified: trunk/tests/org/argouml/ui/TestPropertyPanels.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/ui/TestPropertyPanels.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/ui/TestPropertyPanels.java&p2=trunk/tests/org/argouml/ui/TestPropertyPanels.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/ui/TestPropertyPanels.java (original)
+++ trunk/tests/org/argouml/ui/TestPropertyPanels.java 2007-06-19 14:04:32-0700
@@ -33,10 +33,10 @@
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.argouml.model.InitializeModel;
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
+import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.persistence.AbstractFilePersister;
import org.argouml.persistence.PersistenceManager;
Modified: trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java&p2=trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java 2007-06-19 14:04:32-0700
@@ -30,6 +30,7 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
+import org.argouml.notation.InitNotation;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
@@ -56,6 +57,7 @@
*/
public void setUp() throws Exception {
super.setUp();
+ (new InitNotation()).init();
InitializeModel.initializeDefault();
nodeTypes =
new Object[] {
Modified: trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&p2=trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java (original)
+++ trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java 2007-06-19 14:04:32-0700
@@ -26,6 +26,7 @@
import junit.framework.TestCase;
+import org.argouml.notation.InitNotation;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
/**
@@ -50,6 +51,7 @@
*/
protected void setUp() throws Exception {
super.setUp();
+ (new InitNotation()).init();
diagram = new UMLClassDiagram();
action = new ActionAddAllClassesFromModel("Add all classes from model",
diagram);
Modified: trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java?view=diff&rev=12882&p1=trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&p2=trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&r1=12881&r2=12882
==============================================================================
--- trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java (original)
+++ trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java 2007-06-19 14:04:32-0700
@@ -32,6 +32,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.notation.InitNotation;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.diagram.ui.UMLDiagram;
@@ -69,6 +70,7 @@
* Preparations for all test cases.
*/
protected void setUp() {
+ (new InitNotation()).init();
action = getAction();
ns = getNamespace();
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.