Author: bobtarling
Date: 2008-06-17 12:38:48-0700
New Revision: 14988
Modified:
trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java
trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java
Log:
Simplify the Sequence diagram factory
Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java?view=diff&rev=14988&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java&r1=14987&r2=14988
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java (original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/ActionSequenceDiagram.java 2008-06-17 12:38:48-0700
@@ -60,7 +60,7 @@
protected ArgoDiagram createDiagram(Object namespace) {
LOG.debug("Creating Sequence Diagram");
Object c = createCollaboration(namespace);
- return SequenceDiagramFactory.getInstance().createDiagram(
- UMLSequenceDiagram.class, c, c);
+ SequenceDiagramFactory factory = new SequenceDiagramFactory();
+ return factory.createDiagram(c, null);
}
}
Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java?view=diff&rev=14988&p1=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java&p2=trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java&r1=14987&r2=14988
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java (original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/uml/diagram/sequence2/module/SequenceDiagramFactory.java 2008-06-17 12:38:48-0700
@@ -24,16 +24,7 @@
package org.argouml.uml.diagram.sequence2.module;
-import java.util.LinkedList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-import org.argouml.model.DiDiagram;
-import org.argouml.model.Model;
-import org.argouml.model.SequenceDiagram;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.DiagramFactory;
-import org.argouml.uml.diagram.GraphChangeAdapter;
import org.argouml.uml.diagram.sequence2.ui.UMLSequenceDiagram;
/**
@@ -45,80 +36,20 @@
public class SequenceDiagramFactory {
/**
- * Logger.
- */
- private static final Logger LOG = Logger
- .getLogger(SequenceDiagramFactory.class);
-
-
- private static SequenceDiagramFactory diagramFactory =
- new SequenceDiagramFactory();
-
- private List<ArgoDiagram> diagrams = new LinkedList<ArgoDiagram>();
-
- private SequenceDiagramFactory() {
- }
-
- /**
- * @return the singleton
- */
- public static SequenceDiagramFactory getInstance() {
- return diagramFactory;
- }
-
- /**
* Factory method to create a new instance of an ArgoDiagram,
* including the sequence2 Sequence Diagram
*
- * @param type The class of rendering diagram to create
* @param namespace The namespace that (in)directly
* owns the elements on the diagram
* @param machine The StateMachine for the diagram
* (only: statemachine - activitygraph)
* @return the newly instantiated class diagram
*/
- public ArgoDiagram createDiagram(Class type, Object namespace,
- Object machine) {
-
- ArgoDiagram diagram = null;
- Class diType = null;
-
- if (type == UMLSequenceDiagram.class) {
- diagram = new UMLSequenceDiagram(namespace);
- diType = SequenceDiagram.class;
- LOG.debug("New Sequence Diagram created");
- }
- else {
- // if is not the UML Sequence Diagram, we delegate
- // on the core DiagramFactory
- // This method is deprecated, but we'll keep using it
- // because this code will be deleted with the integration
- // of sequence diagrams in the trunk of argouml.
- return DiagramFactory.getInstance().createDiagram(type,
- namespace, machine);
- }
-
-
- if (diagram == null) {
- throw new IllegalArgumentException ("Unknown diagram type");
- }
-
- if (Model.getDiagramInterchangeModel() != null) {
- diagram.getGraphModel().addGraphEventListener(
- GraphChangeAdapter.getInstance());
- /*
- * The diagram are always owned by the model
- * in this first implementation.
- */
- DiDiagram dd = GraphChangeAdapter.getInstance()
- .createDiagram(diType, namespace);
- // ((UMLMutableGraphSupport) diagram.getGraphModel()).
- // setDiDiagram(dd);
- }
+ public ArgoDiagram createDiagram(
+ final Object namespace,
+ final Object machine) {
- //keep a reference on it in the case where we must add all the diagrams
- //as project members (loading)
- diagrams.add(diagram);
+ final ArgoDiagram diagram = new UMLSequenceDiagram(namespace);
return diagram;
}
}
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.