svn commit: r17122 - trunk/src: argouml-app/src/org/argouml/application argouml-app/src/org/argouml/ui/explorer argouml-app/src/org/argouml/ui/explorer/rules argouml-app/src/org/argouml/uml/cognitive/critics argouml-app/src/org/argouml/uml/diagram argouml-app/tests/org/argouml/application/api argouml-app/tests/org/argouml/cognitive argouml-app/tests/org/argouml/kernel argouml-app/tests/org/argouml/persistence argouml-app/tests/org/argouml/ui argouml-app/tests/org/argouml/uml/diagram/ui argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2009-04-23 21:44:30-0700
New Revision: 17122
Added:
trunk/src/argouml-app/src/org/argouml/uml/diagram/SequenceDiagram.java (contents, props changed)
Modified:
trunk/src/argouml-app/src/org/argouml/application/Main.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java
trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSeqInstanceWithoutClassifier.java
trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java
trunk/src/argouml-app/tests/org/argouml/cognitive/TestItemUID.java
trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java
trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java
trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java
trunk/src/argouml-app/tests/org/argouml/ui/TestPropertyPanels.java
trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java
trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
Log:
Issue 5780: Introduce SequenceDiagram interface to decouple references from implementation and remove references to old sequence diagram implementation
http://argouml.tigris.org/issues/show_bug.cgi?id=5780
Modified: trunk/src/argouml-app/src/org/argouml/application/Main.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/application/Main.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/application/Main.java (original)
+++ trunk/src/argouml-app/src/org/argouml/application/Main.java 2009-04-23 21:44:30-0700
@@ -79,7 +79,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
@@ -409,7 +408,6 @@
SubsystemUtility.initSubsystem(new InitActivityDiagram());
SubsystemUtility.initSubsystem(new InitCollaborationDiagram());
SubsystemUtility.initSubsystem(new InitDeploymentDiagram());
- SubsystemUtility.initSubsystem(new InitSequenceDiagram());
SubsystemUtility.initSubsystem(new InitStateDiagram());
SubsystemUtility.initSubsystem(new InitClassDiagram());
SubsystemUtility.initSubsystem(new InitUseCaseDiagram());
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2008 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -51,8 +51,8 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
import org.argouml.uml.diagram.DiagramUtils;
+import org.argouml.uml.diagram.SequenceDiagram;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
import org.argouml.uml.diagram.ui.ActionAddAllClassesFromModel;
@@ -233,7 +233,7 @@
final boolean activityDiagramActive =
activeDiagram instanceof UMLActivityDiagram;
final boolean sequenceDiagramActive =
- activeDiagram instanceof UMLSequenceDiagram;
+ activeDiagram instanceof SequenceDiagram;
final boolean stateDiagramActive =
activeDiagram instanceof UMLStateDiagram;
final Object selectedStateMachine =
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoClassifierToSequenceDiagram.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -34,8 +34,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
+import org.argouml.uml.diagram.SequenceDiagram;
/**
* Go rule from represented operation to sequence diagram representing it.
@@ -61,10 +60,9 @@
Project p = ProjectManager.getManager().getCurrentProject();
for (ArgoDiagram diagram : p.getDiagramList()) {
- if (diagram instanceof UMLSequenceDiagram
- && col.contains(((SequenceDiagramGraphModel)
- ((UMLSequenceDiagram) diagram).getGraphModel())
- .getCollaboration())) {
+ if (diagram instanceof SequenceDiagram
+ && col.contains(
+ ((SequenceDiagram) diagram).getCollaboration())) {
ret.add(diagram);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoCollaborationToDiagram.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -34,8 +34,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.SequenceDiagram;
import org.argouml.uml.diagram.collaboration.ui.UMLCollaborationDiagram;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
/**
* Rule for Collaboration->Diagram.
@@ -70,10 +70,10 @@
res.add(d);
}
/* Also show unattached sequence diagrams: */
- if ((d instanceof UMLSequenceDiagram)
+ if ((d instanceof SequenceDiagram)
&& (Model.getFacade().getRepresentedClassifier(parent) == null)
&& (Model.getFacade().getRepresentedOperation(parent) == null)
- && (parent == ((UMLSequenceDiagram) d).getNamespace())) {
+ && (parent == ((SequenceDiagram) d).getNamespace())) {
res.add(d);
}
}
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoNamespaceToDiagram.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2007 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -35,8 +35,8 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.SequenceDiagram;
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
/**
@@ -70,7 +70,7 @@
// of the statemachine or activitygraph they belong to.
if (diagram instanceof UMLStateDiagram
|| diagram instanceof UMLActivityDiagram
- || diagram instanceof UMLSequenceDiagram) {
+ || diagram instanceof SequenceDiagram) {
continue;
}
if (diagram.getNamespace() == namespace) {
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/rules/GoOperationToSequenceDiagram.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -34,8 +34,7 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.argouml.uml.diagram.sequence.SequenceDiagramGraphModel;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
+import org.argouml.uml.diagram.SequenceDiagram;
/**
* Rule for Operation->Sequence diagram.
@@ -60,20 +59,16 @@
Set<ArgoDiagram> ret = new HashSet<ArgoDiagram>();
Project p = ProjectManager.getManager().getCurrentProject();
for (ArgoDiagram diagram : p.getDiagramList()) {
- if (diagram instanceof UMLSequenceDiagram
- && col.contains(
- (
- (SequenceDiagramGraphModel)
- ((UMLSequenceDiagram) diagram)
- .getGraphModel())
- .getCollaboration())) {
+ if (diagram instanceof SequenceDiagram
+ && col.contains(((SequenceDiagram) diagram)
+ .getCollaboration())) {
ret.add(diagram);
}
}
return ret;
}
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
/*
@@ -81,6 +76,6 @@
*/
public Set getDependencies(Object parent) {
// TODO: What?
- return Collections.EMPTY_SET;
+ return Collections.emptySet();
}
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrNodesOverlap.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -33,11 +33,10 @@
import org.argouml.cognitive.Designer;
import org.argouml.cognitive.ListSet;
import org.argouml.cognitive.ToDoItem;
-import org.argouml.model.Model;
import org.argouml.uml.cognitive.UMLDecision;
+import org.argouml.uml.diagram.SequenceDiagram;
import org.argouml.uml.diagram.deployment.ui.FigObject;
import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.FigInterface;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
@@ -79,7 +78,7 @@
// fixes bug #669. Sequencediagrams always overlap, so they shall
// never report a problem
- if (dm instanceof UMLSequenceDiagram) {
+ if (dm instanceof SequenceDiagram) {
return NO_PROBLEM;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSeqInstanceWithoutClassifier.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSeqInstanceWithoutClassifier.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSeqInstanceWithoutClassifier.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/cognitive/critics/CrSeqInstanceWithoutClassifier.java 2009-04-23 21:44:30-0700
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2009 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -32,7 +32,8 @@
import org.argouml.model.Model;
import org.argouml.uml.cognitive.UMLDecision;
import org.argouml.uml.cognitive.UMLToDoItem;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
+import org.argouml.uml.diagram.ArgoDiagram;
+import org.argouml.uml.diagram.SequenceDiagram;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
/**
@@ -57,12 +58,13 @@
*/
@Override
public boolean predicate2(Object dm, Designer dsgr) {
- if (!(dm instanceof UMLSequenceDiagram)) {
+ if (!(dm instanceof SequenceDiagram)) {
return NO_PROBLEM;
}
- UMLSequenceDiagram sd = (UMLSequenceDiagram) dm;
- ListSet offs = computeOffenders(sd);
- if (offs == null) return NO_PROBLEM;
+ ListSet offs = computeOffenders((SequenceDiagram) dm);
+ if (offs == null) {
+ return NO_PROBLEM;
+ }
return PROBLEM_FOUND;
}
@@ -72,7 +74,7 @@
*/
@Override
public ToDoItem toDoItem(Object dm, Designer dsgr) {
- UMLSequenceDiagram sd = (UMLSequenceDiagram) dm;
+ SequenceDiagram sd = (SequenceDiagram) dm;
ListSet offs = computeOffenders(sd);
return new UMLToDoItem(this, offs, dsgr);
}
@@ -87,7 +89,7 @@
return false;
}
ListSet offs = i.getOffenders();
- UMLSequenceDiagram sd = (UMLSequenceDiagram) offs.get(0);
+ SequenceDiagram sd = (SequenceDiagram) offs.get(0);
//if (!predicate(dm, dsgr)) return false;
ListSet newOffs = computeOffenders(sd);
boolean res = offs.equals(newOffs);
@@ -103,7 +105,7 @@
* @param sd the diagram to check
* @return the set of offenders
*/
- public ListSet computeOffenders(UMLSequenceDiagram sd) {
+ public ListSet computeOffenders(ArgoDiagram sd) {
Collection figs = sd.getLayer().getContents();
ListSet offs = null;
for (Object obj : figs) {
Added: trunk/src/argouml-app/src/org/argouml/uml/diagram/SequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/SequenceDiagram.java?view=markup&pathrev=17122
==============================================================================
--- (empty file)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/SequenceDiagram.java 2009-04-23 21:44:30-0700
@@ -0,0 +1,18 @@
+// $Id$
+// Copyright (c) 2009 Tom Morris and other contributors.
+// New BSD License
+
+package org.argouml.uml.diagram;
+
+/**
+ * Interface to be implemented by UML Sequence Diagram implementations
+ *
+ * @author Tom Morris
+ */
+public interface SequenceDiagram extends ArgoDiagram {
+
+ /**
+ * @return the collaboration from the associated graph model
+ */
+ public Object getCollaboration();
+}
Modified: trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/application/api/GUITestInitSubsystem.java 2009-04-23 21:44:30-0700
@@ -45,7 +45,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
@@ -83,7 +82,6 @@
initialisers.add(new InitNotationUI());
initialisers.add(new InitNotationUml());
initialisers.add(new InitPatternCritics());
- initialisers.add(new InitSequenceDiagram());
initialisers.add(new InitStateDiagram());
initialisers.add(new InitUiCmdSubsystem()); // X
initialisers.add(new InitUmlUI()); // X
Modified: trunk/src/argouml-app/tests/org/argouml/cognitive/TestItemUID.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/cognitive/TestItemUID.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/cognitive/TestItemUID.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/cognitive/TestItemUID.java 2009-04-23 21:44:30-0700
@@ -47,7 +47,6 @@
import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
import org.argouml.uml.diagram.deployment.ui.FigObject;
import org.argouml.uml.diagram.deployment.ui.UMLDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.diagram.state.ui.FigBranchState;
import org.argouml.uml.diagram.state.ui.FigCompositeState;
import org.argouml.uml.diagram.state.ui.FigDeepHistoryState;
@@ -153,7 +152,7 @@
UMLClassDiagram classdiag = new UMLClassDiagram(namespace);
UMLCollaborationDiagram colldiag = new UMLCollaborationDiagram();
UMLDeploymentDiagram depdiag = new UMLDeploymentDiagram();
- UMLSequenceDiagram seqdiag = new UMLSequenceDiagram();
+// UMLSequenceDiagram seqdiag = new UMLSequenceDiagram();
UMLStateDiagram statediag = new UMLStateDiagram();
checkAssignIDToObject(commentedge, false, true);
@@ -161,7 +160,7 @@
checkAssignIDToObject(classdiag, true, true);
checkAssignIDToObject(colldiag, true, true);
checkAssignIDToObject(depdiag, true, true);
- checkAssignIDToObject(seqdiag, true, true);
+// checkAssignIDToObject(seqdiag, true, true);
checkAssignIDToObject(statediag, true, true);
Model.getUmlFactory().delete(namespace);
Modified: trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/kernel/TestProject.java 2009-04-23 21:44:30-0700
@@ -47,7 +47,6 @@
import org.argouml.uml.diagram.activity.ui.UMLActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.state.ui.UMLStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
@@ -537,7 +536,6 @@
(new InitActivityDiagram()).init();
(new InitCollaborationDiagram()).init();
(new InitDeploymentDiagram()).init();
- (new InitSequenceDiagram()).init();
(new InitStateDiagram()).init();
(new InitClassDiagram()).init();
(new InitUseCaseDiagram()).init();
Modified: trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/persistence/TestZargoFilePersister.java 2009-04-23 21:44:30-0700
@@ -43,7 +43,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
@@ -64,7 +63,6 @@
(new InitActivityDiagram()).init();
(new InitCollaborationDiagram()).init();
(new InitDeploymentDiagram()).init();
- (new InitSequenceDiagram()).init();
(new InitStateDiagram()).init();
(new InitClassDiagram()).init();
(new InitUseCaseDiagram()).init();
Modified: trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/ui/TestDetailsPane.java 2009-04-23 21:44:30-0700
@@ -40,7 +40,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
@@ -77,7 +76,6 @@
(new InitActivityDiagram()).init();
(new InitCollaborationDiagram()).init();
(new InitDeploymentDiagram()).init();
- (new InitSequenceDiagram()).init();
(new InitStateDiagram()).init();
(new InitClassDiagram()).init();
(new InitUseCaseDiagram()).init();
Modified: trunk/src/argouml-app/tests/org/argouml/ui/TestPropertyPanels.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/ui/TestPropertyPanels.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/ui/TestPropertyPanels.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/ui/TestPropertyPanels.java 2009-04-23 21:44:30-0700
@@ -51,7 +51,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
import org.argouml.uml.diagram.ui.InitDiagramAppearanceUI;
@@ -117,7 +116,6 @@
(new InitActivityDiagram()).init();
(new InitCollaborationDiagram()).init();
(new InitDeploymentDiagram()).init();
- (new InitSequenceDiagram()).init();
(new InitStateDiagram()).init();
(new InitClassDiagram()).init();
(new InitUseCaseDiagram()).init();
Modified: trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestActionAddAllClassesFromModel.java 2009-04-23 21:44:30-0700
@@ -35,7 +35,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
import org.argouml.uml.diagram.static_structure.ui.UMLClassDiagram;
@@ -72,7 +71,6 @@
(new InitActivityDiagram()).init();
(new InitCollaborationDiagram()).init();
(new InitDeploymentDiagram()).init();
- (new InitSequenceDiagram()).init();
(new InitStateDiagram()).init();
(new InitClassDiagram()).init();
(new InitUseCaseDiagram()).init();
Modified: trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/uml/diagram/ui/TestTabDiagram.java 2009-04-23 21:44:30-0700
@@ -43,7 +43,6 @@
import org.argouml.uml.diagram.activity.ui.InitActivityDiagram;
import org.argouml.uml.diagram.collaboration.ui.InitCollaborationDiagram;
import org.argouml.uml.diagram.deployment.ui.InitDeploymentDiagram;
-import org.argouml.uml.diagram.sequence.ui.InitSequenceDiagram;
import org.argouml.uml.diagram.state.ui.InitStateDiagram;
import org.argouml.uml.diagram.static_structure.ui.FigClass;
import org.argouml.uml.diagram.static_structure.ui.InitClassDiagram;
@@ -85,7 +84,6 @@
(new InitActivityDiagram()).init();
(new InitCollaborationDiagram()).init();
(new InitDeploymentDiagram()).init();
- (new InitSequenceDiagram()).init();
(new InitStateDiagram()).init();
(new InitClassDiagram()).init();
(new InitUseCaseDiagram()).init();
Modified: trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java?view=diff&pathrev=17122&r1=17121&r2=17122
==============================================================================
--- trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java (original)
+++ trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java 2009-04-23 21:44:30-0700
@@ -34,6 +34,7 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.SequenceDiagram;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.ui.ActionSetMode;
import org.argouml.uml.diagram.ui.RadioAction;
@@ -54,7 +55,7 @@
*
* @author penyaskito
*/
-public class UMLSequenceDiagram extends UMLDiagram {
+public class UMLSequenceDiagram extends UMLDiagram implements SequenceDiagram {
private Object[] actions;
@@ -295,4 +296,8 @@
public ModePlace getModePlace(GraphFactory gf, String instructions) {
return new ModePlaceClassifierRole(gf, instructions);
}
+
+ public Object getCollaboration() {
+ return ((SequenceDiagramGraphModel) getGraphModel()).getCollaboration();
+ }
}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1886261
To unsubscribe from this discussion, e-mail: [[email protected]].