Author: bobtarling Date: 2011-07-30 03:44:17-0700 New Revision: 19619 Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java
Log: Make diagrams implement a specific interface depending on their type Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java?view=diff&pathrev=19619&r1=19618&r2=19619 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java 2011-07-30 03:44:17-0700 @@ -53,6 +53,7 @@ import org.apache.log4j.Logger; import org.argouml.i18n.Translator; +import org.argouml.model.ActivityDiagram; import org.argouml.model.ActivityGraphsHelper; import org.argouml.model.DeleteInstanceEvent; import org.argouml.model.Model; @@ -101,7 +102,7 @@ * * TODO: Finish the work on subactivity states. */ -public class UMLActivityDiagram extends UMLDiagram { +public class UMLActivityDiagram extends UMLDiagram implements ActivityDiagram { /** * Logger. Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&pathrev=19619&r1=19618&r2=19619 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java 2011-07-30 03:44:17-0700 @@ -49,6 +49,7 @@ import org.apache.log4j.Logger; import org.argouml.i18n.Translator; +import org.argouml.model.CollaborationDiagram; import org.argouml.model.Model; import org.argouml.uml.diagram.DiagramElement; import org.argouml.uml.diagram.DiagramSettings; @@ -81,7 +82,7 @@ * * @author agaut...@ics.uci.edu */ -public class UMLCollaborationDiagram extends UMLDiagram { +public class UMLCollaborationDiagram extends UMLDiagram implements CollaborationDiagram { /** * Logging. Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java?view=diff&pathrev=19619&r1=19618&r2=19619 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/UMLDeploymentDiagram.java 2011-07-30 03:44:17-0700 @@ -47,6 +47,7 @@ import org.apache.log4j.Logger; import org.argouml.i18n.Translator; +import org.argouml.model.DeploymentDiagram; import org.argouml.model.Facade; import org.argouml.model.Model; import org.argouml.ui.CmdCreateNode; @@ -77,7 +78,7 @@ * * @author Clemens Eichler */ -public class UMLDeploymentDiagram extends UMLDiagram { +public class UMLDeploymentDiagram extends UMLDiagram implements DeploymentDiagram { /** * Logger. */ Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&pathrev=19619&r1=19618&r2=19619 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java 2011-07-30 03:44:17-0700 @@ -52,6 +52,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; @@ -86,7 +87,7 @@ * The correct name for this class would be * "UMLStatechartDiagram". See issue 2306. */ -public class UMLStateDiagram extends UMLDiagram { +public class UMLStateDiagram extends UMLDiagram implements StateDiagram { private static final long serialVersionUID = -1541136327444703151L; Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java?view=diff&pathrev=19619&r1=19618&r2=19619 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/UMLClassDiagram.java 2011-07-30 03:44:17-0700 @@ -47,6 +47,7 @@ import org.apache.log4j.Logger; import org.argouml.i18n.Translator; +import org.argouml.model.ClassDiagram; import org.argouml.model.CoreFactory; import org.argouml.model.Model; import org.argouml.uml.CommentEdge; @@ -90,7 +91,7 @@ * * @author jrobb...@ics.uci.edy */ -public class UMLClassDiagram extends UMLDiagram { +public class UMLClassDiagram extends UMLDiagram implements ClassDiagram { private static final long serialVersionUID = -9192325790126361563L; Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java?view=diff&pathrev=19619&r1=19618&r2=19619 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/UMLUseCaseDiagram.java 2011-07-30 03:44:17-0700 @@ -50,6 +50,7 @@ import org.apache.log4j.Logger; import org.argouml.i18n.Translator; import org.argouml.model.Model; +import org.argouml.model.UseCaseDiagram; import org.argouml.ui.CmdCreateNode; import org.argouml.uml.diagram.DiagramElement; import org.argouml.uml.diagram.DiagramSettings; @@ -77,7 +78,7 @@ * * A use case diagram has as owner either a package or a classifier. */ -public class UMLUseCaseDiagram extends UMLDiagram { +public class UMLUseCaseDiagram extends UMLDiagram implements UseCaseDiagram { private static final Logger LOG = Logger.getLogger(UMLUseCaseDiagram.class); ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2806679 To unsubscribe from this discussion, e-mail: [commits-unsubscr...@argouml.tigris.org].
