svn commit: r19620 - trunk/src: argouml-core-diagrams-deployment2/src/org/argouml/deployment2/diagram argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram argouml-core-diagrams-state2/src/org/argouml/state2/diagram

Author: bobtarling
Date: 2011-07-30 03:45:16-0700
New Revision: 19620

Modified:
   trunk/src/argouml-core-diagrams-deployment2/src/org/argouml/deployment2/diagram/UMLDeploymentDiagram.java
   trunk/src/argouml-core-diagrams-sequence2/src/org/argouml/sequence2/diagram/UMLSequenceDiagram.java
   trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java

Log:
Make diagrams implement a specific interface depending on their type

Modified: trunk/src/argouml-core-diagrams-deployment2/src/org/argouml/deployment2/diagram/UMLDeploymentDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-deployment2/src/org/argouml/deployment2/diagram/UMLDeploymentDiagram.java?view=diff&pathrev=19620&r1=19619&r2=19620
==============================================================================
--- trunk/src/argouml-core-diagrams-deployment2/src/org/argouml/deployment2/diagram/UMLDeploymentDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-deployment2/src/org/argouml/deployment2/diagram/UMLDeploymentDiagram.java	2011-07-30 03:45:16-0700
@@ -25,6 +25,7 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.model.DeleteInstanceEvent;
+import org.argouml.model.DeploymentDiagram;
 import org.argouml.model.Model;
 import org.argouml.ui.CmdCreateNode;
 import org.argouml.uml.diagram.DiagramElement;
@@ -51,7 +52,7 @@
  * Diagram for UML2 Deployment Diagram
  * @author Bob Tarling
  */
-public class UMLDeploymentDiagram extends UMLDiagram {
+public class UMLDeploymentDiagram extends UMLDiagram implements DeploymentDiagram {
 
     private static final List acceptList = Arrays.asList(new Object[] {
             Model.getMetaTypes().getActor(),

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=19620&r1=19619&r2=19620
==============================================================================
--- 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	2011-07-30 03:45:16-0700
@@ -50,9 +50,9 @@
 import org.argouml.model.CollaborationsHelper;
 import org.argouml.model.Facade;
 import org.argouml.model.Model;
+import org.argouml.model.SequenceDiagram;
 import org.argouml.uml.diagram.DiagramElement;
 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.FigNodeModelElement;
@@ -74,7 +74,8 @@
  *
  * @author penyaskito
  */
-public class UMLSequenceDiagram extends UMLDiagram implements SequenceDiagram {
+public class UMLSequenceDiagram extends UMLDiagram 
+        implements org.argouml.uml.diagram.SequenceDiagram, SequenceDiagram {
     
     private Object[] actions;
 

Modified: trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java?view=diff&pathrev=19620&r1=19619&r2=19620
==============================================================================
--- trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java	(original)
+++ trunk/src/argouml-core-diagrams-state2/src/org/argouml/state2/diagram/UMLStateDiagram.java	2011-07-30 03:45:16-0700
@@ -24,6 +24,7 @@
 import org.argouml.i18n.Translator;
 import org.argouml.model.DeleteInstanceEvent;
 import org.argouml.model.Model;
+import org.argouml.model.StateDiagram;
 import org.argouml.ui.CmdCreateNode;
 import org.argouml.uml.diagram.DiagramElement;
 import org.argouml.uml.diagram.DiagramFactory;
@@ -52,7 +53,7 @@
  * Diagram for UML2 State Machine diagram
  * @author Bob Tarling
  */
-public class UMLStateDiagram extends UMLDiagram {
+public class UMLStateDiagram extends UMLDiagram implements StateDiagram {
 
     /**
      * Construct a State Diagram. Default constructor used by PGML parser during

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2806680

To unsubscribe from this discussion, e-mail: [[email protected]].