Author: mvw
Date: 2007-07-05 07:28:59-0700
New Revision: 12987
Added:
trunk/tests/org/argouml/notation/TestNotationProvider.java
- copied, changed from r12753, /trunk/tests/org/argouml/notation/providers/TestNotationProvider.java
Removed:
trunk/tests/org/argouml/notation/providers/TestNotationProvider.java
Modified:
trunk/tests/org/argouml/TestDependencies.java
trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java
trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.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:
Changed dependencies for the Notation subsystem - more conform the ArgoUML structure.
Reduced the large cycle from 48 classes to 46.
Updated cookbook with new architecture.
Modified: trunk/tests/org/argouml/TestDependencies.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/TestDependencies.java?view=diff&rev=12987&p1=trunk/tests/org/argouml/TestDependencies.java&p2=trunk/tests/org/argouml/TestDependencies.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/TestDependencies.java (original)
+++ trunk/tests/org/argouml/TestDependencies.java 2007-07-05 07:28:59-0700
@@ -94,10 +94,10 @@
"org.argouml.gefext",
"org.argouml.language.ui",
"org.argouml.moduleloader",
- "org.argouml.notation.providers",
+ //"org.argouml.notation.providers",//fails because sub-packages fail (?)
//"org.argouml.notation.providers.java",
//"org.argouml.notation.providers.uml",
- //"org.argouml.notation",
+ //"org.argouml.notation",//fails because sub-packages fail (?)
//"org.argouml.notation.ui",
"org.argouml.swingext",
"org.argouml.taskmgmt",
Copied: trunk/tests/org/argouml/notation/TestNotationProvider.java (from r12753, /trunk/tests/org/argouml/notation/providers/TestNotationProvider.java)
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/TestNotationProvider.java?view=diff&rev=12987&p1=/trunk/tests/org/argouml/notation/providers/TestNotationProvider.java&p2=trunk/tests/org/argouml/notation/TestNotationProvider.java&r1=12753&r2=12987
==============================================================================
--- /trunk/tests/org/argouml/notation/providers/TestNotationProvider.java (original)
+++ trunk/tests/org/argouml/notation/TestNotationProvider.java 2007-07-05 07:28:59-0700
@@ -22,7 +22,7 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-package org.argouml.notation.providers;
+package org.argouml.notation;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
@@ -34,6 +34,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
+import org.argouml.notation.NotationProvider;
/**
* @author Michiel
Removed: trunk/tests/org/argouml/notation/providers/TestNotationProvider.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/TestNotationProvider.java?view=auto&rev=12986
Modified: trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java?view=diff&rev=12987&p1=trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&p2=trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java (original)
+++ trunk/tests/org/argouml/notation/providers/TestNotationProviderFactory2.java 2007-07-05 07:28:59-0700
@@ -34,6 +34,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.notation.Notation;
import org.argouml.notation.NotationName;
+import org.argouml.notation.NotationProvider;
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=12987&p1=trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestAttributeAndOperationNotationUml.java 2007-07-05 07:28:59-0700
@@ -37,7 +37,8 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
+import org.argouml.notation.providers.java.InitNotationJava;
/**
* @author michiel
@@ -116,6 +117,8 @@
*/
protected void setUp() {
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
}
/**
Modified: trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java?view=diff&rev=12987&p1=trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java&p2=trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java (original)
+++ trunk/tests/org/argouml/notation/providers/uml/TestTransitionNotationUml.java 2007-07-05 07:28:59-0700
@@ -32,7 +32,7 @@
import org.argouml.kernel.Project;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
-import org.argouml.notation.providers.NotationProvider;
+import org.argouml.notation.NotationProvider;
/**
* Test ParserDisplay: parsing transitions.
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=12987&p1=trunk/tests/org/argouml/persistence/TestZargoFilePersister.java&p2=trunk/tests/org/argouml/persistence/TestZargoFilePersister.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/persistence/TestZargoFilePersister.java (original)
+++ trunk/tests/org/argouml/persistence/TestZargoFilePersister.java 2007-07-05 07:28:59-0700
@@ -34,6 +34,8 @@
import org.argouml.kernel.Project;
import org.argouml.model.InitializeModel;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
/**
* Testcase to load projects without exception.
@@ -44,6 +46,8 @@
protected void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
}
/**
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=12987&p1=trunk/tests/org/argouml/ui/TestPropertyPanels.java&p2=trunk/tests/org/argouml/ui/TestPropertyPanels.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/ui/TestPropertyPanels.java (original)
+++ trunk/tests/org/argouml/ui/TestPropertyPanels.java 2007-07-05 07:28:59-0700
@@ -39,6 +39,8 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.persistence.AbstractFilePersister;
import org.argouml.persistence.PersistenceManager;
import org.argouml.ui.targetmanager.TargetEvent;
@@ -96,6 +98,8 @@
protected void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
if (theDetailsPane == null) {
theDetailsPane =
@@ -122,6 +126,9 @@
public static Test suite() throws Exception {
InitializeModel.initializeDefault();
new InitNotation().init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).init();
+
// constains instances of each modelelement
// used for testing so that we only use each modelelement
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=12987&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=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java (original)
+++ trunk/tests/org/argouml/uml/diagram/static_structure/ui/TestUMLClassDiagram.java 2007-07-05 07:28:59-0700
@@ -31,6 +31,8 @@
import org.argouml.model.InitializeModel;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
@@ -58,6 +60,9 @@
public void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).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=12987&p1=trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&p2=trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java (original)
+++ trunk/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java 2007-07-05 07:28:59-0700
@@ -27,6 +27,8 @@
import junit.framework.TestCase;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
/**
@@ -52,6 +54,9 @@
protected void setUp() throws Exception {
super.setUp();
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).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=12987&p1=trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&p2=trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java&r1=12986&r2=12987
==============================================================================
--- trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java (original)
+++ trunk/tests/org/argouml/uml/ui/AbstractTestActionAddDiagram.java 2007-07-05 07:28:59-0700
@@ -33,6 +33,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.notation.InitNotation;
+import org.argouml.notation.providers.java.InitNotationJava;
+import org.argouml.notation.providers.uml.InitNotationUml;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
@@ -71,6 +73,9 @@
*/
protected void setUp() {
(new InitNotation()).init();
+ (new InitNotationUml()).init();
+ (new InitNotationJava()).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.