Author: bobtarling Date: 2010-07-17 05:47:53-0700 New Revision: 18525 Modified: 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/src/org/argouml/model/MetaTypes.java
Log: Define more model element types that are used by activity diagrams 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=18525&r1=18524&r2=18525 ============================================================================== --- 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-17 05:47:53-0700 @@ -18,6 +18,7 @@ import org.eclipse.uml2.uml.Abstraction; import org.eclipse.uml2.uml.Action; import org.eclipse.uml2.uml.Activity; +import org.eclipse.uml2.uml.ActivityParameterNode; import org.eclipse.uml2.uml.ActivityPartition; import org.eclipse.uml2.uml.Actor; import org.eclipse.uml2.uml.AggregationKind; @@ -29,13 +30,16 @@ import org.eclipse.uml2.uml.CallBehaviorAction; import org.eclipse.uml2.uml.CallConcurrencyKind; import org.eclipse.uml2.uml.CallEvent; +import org.eclipse.uml2.uml.CentralBufferNode; import org.eclipse.uml2.uml.ChangeEvent; import org.eclipse.uml2.uml.Classifier; import org.eclipse.uml2.uml.Collaboration; import org.eclipse.uml2.uml.Comment; import org.eclipse.uml2.uml.Component; import org.eclipse.uml2.uml.Constraint; +import org.eclipse.uml2.uml.ControlFlow; import org.eclipse.uml2.uml.CreateObjectAction; +import org.eclipse.uml2.uml.DataStoreNode; import org.eclipse.uml2.uml.DataType; import org.eclipse.uml2.uml.Dependency; import org.eclipse.uml2.uml.DestroyObjectAction; @@ -43,6 +47,7 @@ import org.eclipse.uml2.uml.ElementImport; import org.eclipse.uml2.uml.Enumeration; import org.eclipse.uml2.uml.EnumerationLiteral; +import org.eclipse.uml2.uml.ExpansionNode; import org.eclipse.uml2.uml.Expression; import org.eclipse.uml2.uml.Extend; import org.eclipse.uml2.uml.ExtensionPoint; @@ -59,6 +64,7 @@ import org.eclipse.uml2.uml.MultiplicityElement; import org.eclipse.uml2.uml.Namespace; import org.eclipse.uml2.uml.Node; +import org.eclipse.uml2.uml.ObjectFlow; import org.eclipse.uml2.uml.ObjectNode; import org.eclipse.uml2.uml.Operation; import org.eclipse.uml2.uml.PackageImport; @@ -131,6 +137,10 @@ return Activity.class; } + public Object getActivityParameterNode() { + return ActivityParameterNode.class; + } + public Object getActor() { return Actor.class; } @@ -205,6 +215,10 @@ return State.class; } + public Object getCentralBufferNode() { + return CentralBufferNode.class; + } + public Object getClassifier() { return Classifier.class; } @@ -243,8 +257,12 @@ return Constraint.class; } + public Object getControlFlow() { + return ControlFlow.class; + } + public Object getCreateAction() { - throw new NotImplementedException("This is not a UML2 element"); + throw new NotImplementedException("This is not a UML2 element"); //$NON-NLS-1$ } public Object getCreateObjectAction() { @@ -260,7 +278,7 @@ } public Object getDestroyAction() { - throw new NotImplementedException("This is not a UML2 class"); + throw new NotImplementedException("This is not a UML2 class"); //$NON-NLS-1$ } public Object getDestroyObjectAction() { @@ -406,9 +424,12 @@ // return org.eclipse.uml2.uml.ObjectNode.class; } + public Object getObjectFlow() { + return ObjectFlow.class; + } + public Object getObjectFlowState() { - // TODO: not in UML 2.1 - return ObjectNode.class; + throw new NotImplementedException("This is not a UML1.4 class"); //$NON-NLS-1$ } public Object getOperation() { @@ -599,13 +620,15 @@ } public Object getCollaborationInstanceSet() { - // TODO: Need UML 2.x equivalent - return null /*CollaborationInstanceSet.class*/; + throw new NotYetImplementedException(); } public Object getDataValue() { - // TODO: Need UML 2.x equivalent - return null /*DataValue.class*/; + throw new NotYetImplementedException(); + } + + public Object getDataStoreNode() { + return DataStoreNode.class; } public Object getElement() { @@ -621,6 +644,10 @@ return Expression.class; } + public Object getExpansionNode() { + return ExpansionNode.class; + } + public Object getFeature() { return Feature.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=18525&r1=18524&r2=18525 ============================================================================== --- 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-17 05:47:53-0700 @@ -277,6 +277,14 @@ o = UMLFactory.eINSTANCE.createCreateObjectAction(); } else if (elementType == metaTypes.getDestroyObjectAction()) { o = UMLFactory.eINSTANCE.createDestroyObjectAction(); + } else if (elementType == metaTypes.getActivityParameterNode()) { + o = UMLFactory.eINSTANCE.createActivityParameterNode(); + } else if (elementType == metaTypes.getCentralBufferNode()) { + o = UMLFactory.eINSTANCE.createCentralBufferNode(); + } else if (elementType == metaTypes.getDataStoreNode()) { + o = UMLFactory.eINSTANCE.createDataStoreNode(); + } else if (elementType == metaTypes.getExpansionNode()) { + o = UMLFactory.eINSTANCE.createDataStoreNode(); } else if (elementType == metaTypes.getSimpleState()) { o = modelImpl.getStateMachinesFactory().createSimpleState(); } else if (elementType == metaTypes.getFinalState()) { 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=18525&r1=18524&r2=18525 ============================================================================== --- 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-17 05:47:53-0700 @@ -224,6 +224,10 @@ return ActivityGraph.class; } + public Object getActivityParameterNode() { + throw new NotImplementedException("This is not a UML1.4 class"); + } + public Object getActor() { return Actor.class; } @@ -288,6 +292,10 @@ return CallState.class; } + public Object getCentralBufferNode() { + throw new NotImplementedException("This is not a UML1.4 class"); + } + public Object getUMLClass() { return UmlClass.class; } @@ -324,6 +332,10 @@ return Constraint.class; } + public Object getControlFlow() { + throw new NotImplementedException("This is not a UML1.4 class"); + } + public Object getCreateAction() { return CreateAction.class; } @@ -331,6 +343,10 @@ public Object getCreateObjectAction() { throw new NotImplementedException("This is not a UML1.4 class"); } + + public Object getDataStoreNode() { + throw new NotImplementedException("This is not a UML1.4 class"); + } public Object getDataType() { return DataType.class; @@ -368,6 +384,10 @@ return UmlException.class; } + public Object getExpansionNode() { + throw new NotImplementedException("This is not a UML1.4 class"); + } + public Object getExtend() { return Extend.class; } @@ -440,6 +460,10 @@ return org.omg.uml.behavioralelements.commonbehavior.Object.class; } + public Object getObjectFlow() { + throw new NotImplementedException("This is not a UML1.4 class"); + } + public Object getObjectFlowState() { return ObjectFlowState.class; } 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=18525&r1=18524&r2=18525 ============================================================================== --- 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-17 05:47:53-0700 @@ -87,6 +87,11 @@ Object getActivity(); /** + * @return the ActivityParameterNode class for UML2 + */ + Object getActivityParameterNode(); + + /** * @return Returns the Actor. */ Object getActor(); @@ -167,6 +172,11 @@ Object getCallState(); /** + * @return the CentralBufferNode class for UML2 + */ + Object getCentralBufferNode(); + + /** * Return the UML Class class. This method has a special name because Java * already uses the getClass() method. * @@ -213,6 +223,11 @@ * @return Return the Constraint type. */ Object getConstraint(); + + /** + * @return Returns the ControlFlow class for UML2 + */ + Object getControlFlow(); /** * @return Returns the CreateAction. @@ -230,6 +245,11 @@ Object getDataType(); /** + * @return Returns the DataStoreNode class for UML2. + */ + Object getDataStoreNode(); + + /** * @return Returns the Dependency. */ Object getDependency(); @@ -270,6 +290,11 @@ Object getException(); /** + * @return Returns the ExpansionNode class for UML2 + */ + Object getExpansionNode(); + + /** * @return Returns the Extend. */ Object getExtend(); @@ -367,6 +392,11 @@ Object getObjectFlowState(); /** + * @return Returns the ObjectFlow class for UML2 + */ + Object getObjectFlow(); + + /** * @return Returns the Operation. */ Object getOperation(); ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2634438 To unsubscribe from this discussion, e-mail: [[email protected]].
