Author: bobtarling Date: 2010-07-14 09:11:43-0700 New Revision: 18515 Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionActivityDiagram.java trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ActivityGraphsFactoryEUMLlImpl.java trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java
Log: Remove some usage of the term ActivityGraph (hopefully this will only remain in the MDR model implementation and old diagram implementation) Modified: trunk/src/argouml-app/src/org/argouml/uml/ui/ActionActivityDiagram.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/ui/ActionActivityDiagram.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-app/src/org/argouml/uml/ui/ActionActivityDiagram.java (original) +++ trunk/src/argouml-app/src/org/argouml/uml/ui/ActionActivityDiagram.java 2010-07-14 09:11:43-0700 @@ -67,13 +67,13 @@ @Override protected ArgoDiagram createDiagram(Object namespace, DiagramSettings settings) { - Object context = getContext(namespace); - Object graph = - Model.getActivityGraphsFactory().buildActivityGraph(context); + final Object context = getContext(namespace); + final Object activity = + Model.getUmlFactory().buildNode(Model.getMetaTypes().getActivity(), context); return DiagramFactory.getInstance().create( DiagramFactory.DiagramType.Activity, - graph, settings); + activity, settings); } private Object getContext(Object namespace) { Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ActivityGraphsFactoryEUMLlImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ActivityGraphsFactoryEUMLlImpl.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ActivityGraphsFactoryEUMLlImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/ActivityGraphsFactoryEUMLlImpl.java 2010-07-14 09:11:43-0700 @@ -57,7 +57,7 @@ } RunnableClass run = new RunnableClass() { public void run() { - Activity activity = UMLFactory.eINSTANCE.createActivity(); + Activity activity = (Activity)createActivityGraph(); activity.setPackage((org.eclipse.uml2.uml.Package)theContext); getParams().add(activity); } @@ -87,8 +87,7 @@ } public Object createActivityGraph() { - // TODO: Auto-generated method stub - throw new NotYetImplementedException(); + return UMLFactory.eINSTANCE.createActivity(); } public Object createCallState() { Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java 2010-07-14 09:11:43-0700 @@ -17,6 +17,7 @@ import org.argouml.model.NotImplementedException; import org.eclipse.uml2.uml.Abstraction; import org.eclipse.uml2.uml.Action; +import org.eclipse.uml2.uml.Activity; import org.eclipse.uml2.uml.ActivityPartition; import org.eclipse.uml2.uml.Actor; import org.eclipse.uml2.uml.AggregationKind; @@ -123,9 +124,9 @@ return State.class; } -// public Object getActivityGraph() { -// return ActivityGraph.class; -// } + public Object getActivity() { + return Activity.class; + } public Object getActor() { return Actor.class; Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java (original) +++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java 2010-07-14 09:11:43-0700 @@ -268,6 +268,8 @@ } else if (elementType == metaTypes.getInstance()) { throw new IllegalArgumentException( "Attempt to instantiate abstract type"); //$NON-NLS-1$ + } else if (elementType == metaTypes.getActivity()) { + o = modelImpl.getActivityGraphsFactory().createActivityGraph(); } else if (elementType == metaTypes.getCallState()) { o = modelImpl.getActivityGraphsFactory().createCallState(); } else if (elementType == metaTypes.getSimpleState()) { Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java 2010-07-14 09:11:43-0700 @@ -41,7 +41,9 @@ import javax.jmi.model.PrimitiveType; import org.argouml.model.MetaTypes; +import org.argouml.model.NotImplementedException; import org.omg.uml.behavioralelements.activitygraphs.ActionState; +import org.omg.uml.behavioralelements.activitygraphs.ActivityGraph; import org.omg.uml.behavioralelements.activitygraphs.CallState; import org.omg.uml.behavioralelements.activitygraphs.ClassifierInState; import org.omg.uml.behavioralelements.activitygraphs.ObjectFlowState; @@ -218,6 +220,10 @@ return ActionState.class; } + public Object getActivity() { + return ActivityGraph.class; + } + public Object getActor() { return Actor.class; } Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java (original) +++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/UmlFactoryMDRImpl.java 2010-07-14 09:11:43-0700 @@ -893,6 +893,8 @@ element = Model.getStateMachinesFactory().buildSubmachineState(container); } else if (elementType == metaTypes.getTransition() && container instanceof State) { element = Model.getStateMachinesFactory().buildInternalTransition(container); + } else if (elementType == metaTypes.getActivity()) { + element = Model.getActivityGraphsFactory().buildActivityGraph(container); } else { // build all other elements using existing buildNode element = buildNode(elementType); Modified: trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java?view=diff&pathrev=18515&r1=18514&r2=18515 ============================================================================== --- trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java (original) +++ trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java 2010-07-14 09:11:43-0700 @@ -81,11 +81,10 @@ */ Object getActionState(); - // Not in UML 2.x - don't implement -// /** -// * @return the ActivityGraph class. -// */ -// Object getActivityGraph(); + /** + * @return the Activity class for UML2 + */ + Object getActivity(); /** * @return Returns the Actor. ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2633178 To unsubscribe from this discussion, e-mail: [[email protected]].
