svn commit: r16418 - trunk/src: argouml-core-model-euml/src/org/argouml/model/euml argouml-core-model-mdr/src/org/argouml/model/mdr argouml-core-model/src/org/argouml/model

Author: tfmorris
Date: 2008-12-22 14:22:17-0800
New Revision: 16418

Modified:
   trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.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:
Add missing metatypes

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=16418&r1=16417&r2=16418
==============================================================================
--- 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	2008-12-22 14:22:17-0800
@@ -39,6 +39,8 @@
 import org.eclipse.uml2.uml.BehavioralFeature;
 import org.eclipse.uml2.uml.CallAction;
 import org.eclipse.uml2.uml.CallConcurrencyKind;
+import org.eclipse.uml2.uml.CallEvent;
+import org.eclipse.uml2.uml.ChangeEvent;
 import org.eclipse.uml2.uml.Classifier;
 import org.eclipse.uml2.uml.Collaboration;
 import org.eclipse.uml2.uml.Comment;
@@ -50,8 +52,10 @@
 import org.eclipse.uml2.uml.ElementImport;
 import org.eclipse.uml2.uml.Enumeration;
 import org.eclipse.uml2.uml.EnumerationLiteral;
+import org.eclipse.uml2.uml.Expression;
 import org.eclipse.uml2.uml.Extend;
 import org.eclipse.uml2.uml.ExtensionPoint;
+import org.eclipse.uml2.uml.Feature;
 import org.eclipse.uml2.uml.FinalState;
 import org.eclipse.uml2.uml.Generalization;
 import org.eclipse.uml2.uml.Include;
@@ -69,23 +73,29 @@
 import org.eclipse.uml2.uml.PackageImport;
 import org.eclipse.uml2.uml.Parameter;
 import org.eclipse.uml2.uml.ParameterDirectionKind;
+import org.eclipse.uml2.uml.PrimitiveType;
 import org.eclipse.uml2.uml.Property;
 import org.eclipse.uml2.uml.Pseudostate;
 import org.eclipse.uml2.uml.PseudostateKind;
 import org.eclipse.uml2.uml.Reception;
+import org.eclipse.uml2.uml.Relationship;
 import org.eclipse.uml2.uml.Signal;
+import org.eclipse.uml2.uml.SignalEvent;
 import org.eclipse.uml2.uml.State;
 import org.eclipse.uml2.uml.StateMachine;
 import org.eclipse.uml2.uml.Stereotype;
+import org.eclipse.uml2.uml.StructuralFeature;
 import org.eclipse.uml2.uml.TemplateBinding;
 import org.eclipse.uml2.uml.TemplateParameter;
 import org.eclipse.uml2.uml.TemplateParameterSubstitution;
+import org.eclipse.uml2.uml.TimeEvent;
 import org.eclipse.uml2.uml.Transition;
 import org.eclipse.uml2.uml.Usage;
 import org.eclipse.uml2.uml.UseCase;
 import org.eclipse.uml2.uml.VisibilityKind;
 
 
+
 /**
  * The implementation of the MetaTypes for EUML2.
  */
@@ -546,4 +556,119 @@
         return VisibilityKind.class;
     }
 
+    
+    public Object getActionSequence() {
+        // TODO: Need UML 2.x equivalent
+        return null /*ActionSequence.class*/;
+    }
+
+    public Object getArgument() {
+        // TODO: Need UML 2.x equivalent
+        return null /*Argument.class*/;
+    }
+
+    public Object getAttributeLink() {
+        // TODO: Need UML 2.x equivalent
+        return null /*AttributeLink.class*/;
+    }
+
+    public Object getCallEvent() {
+        return CallEvent.class;
+    }
+
+    public Object getChangeEvent() {
+        return ChangeEvent.class;
+    }
+
+    public Object getClassifierInState() {
+        // TODO: Need UML 2.x equivalent
+        return null /*ClassifierInState.class*/;
+    }
+
+    public Object getCollaborationInstanceSet() {
+        // TODO: Need UML 2.x equivalent
+        return null /*CollaborationInstanceSet.class*/;
+    }
+
+    public Object getDataValue() {
+        // TODO: Need UML 2.x equivalent
+        return null /*DataValue.class*/;
+    }
+
+    public Object getElement() {
+        return Element.class;
+    }
+
+    public Object getElementResidence() {
+        // TODO: Need UML 2.x equivalent
+        return null /*ElementResidence.class*/;
+    }
+
+    public Object getExpression() {
+        return Expression.class;
+    }
+
+    public Object getFeature() {
+        return Feature.class;
+    }
+
+    public Object getFlow() {
+        // TODO: Need UML 2.x equivalent
+        return null /*Flow.class*/;
+    }
+
+    public Object getInteractionInstanceSet() {
+        // TODO: Need UML 2.x equivalent
+        return null /*InteractionInstanceSet.class*/;
+    }
+
+    public Object getLinkEnd() {
+        // TODO: Need UML 2.x equivalent
+        return null /*LinkEnd.class*/;
+    }
+
+    public Object getLinkObject() {
+        // TODO: Need UML 2.x equivalent
+        return null /*LinkObject.class*/;
+    }
+
+    public Object getMethod() {
+        // TODO: Need UML 2.x equivalent
+        return null /*Method.class*/;
+    }
+
+    public Object getMultiplicityRange() {
+        return MultiplicityElement.class;
+    }
+
+    public Object getPrimitiveType() {
+        return PrimitiveType.class;
+    }
+
+    public Object getRelationship() {
+        return Relationship.class;
+    }
+
+    public Object getSignalEvent() {
+        return SignalEvent.class;
+    }
+
+    public Object getStructuralFeature() {
+        return StructuralFeature.class;
+    }
+
+    public Object getSubsystemInstance() {
+        // TODO: Need UML 2.x equivalent
+        return null /*SubsystemInstance.class*/;
+    }
+
+    public Object getTimeEvent() {
+        return TimeEvent.class;
+    }
+
+    public Object getUninterpretedAction() {
+        // TODO: Need UML 2.x equivalent
+        return null /*UninterpretedAction.class*/;
+    }
+
 }

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=16418&r1=16417&r2=16418
==============================================================================
--- 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	2008-12-22 14:22:17-0800
@@ -24,9 +24,12 @@
 
 package org.argouml.model.mdr;
 
+import javax.jmi.model.PrimitiveType;
+
 import org.argouml.model.MetaTypes;
 import org.omg.uml.behavioralelements.activitygraphs.ActionState;
 import org.omg.uml.behavioralelements.activitygraphs.CallState;
+import org.omg.uml.behavioralelements.activitygraphs.ClassifierInState;
 import org.omg.uml.behavioralelements.activitygraphs.ObjectFlowState;
 import org.omg.uml.behavioralelements.activitygraphs.Partition;
 import org.omg.uml.behavioralelements.activitygraphs.SubactivityState;
@@ -34,28 +37,41 @@
 import org.omg.uml.behavioralelements.collaborations.AssociationRole;
 import org.omg.uml.behavioralelements.collaborations.ClassifierRole;
 import org.omg.uml.behavioralelements.collaborations.Collaboration;
+import org.omg.uml.behavioralelements.collaborations.CollaborationInstanceSet;
 import org.omg.uml.behavioralelements.collaborations.Interaction;
+import org.omg.uml.behavioralelements.collaborations.InteractionInstanceSet;
 import org.omg.uml.behavioralelements.collaborations.Message;
 import org.omg.uml.behavioralelements.commonbehavior.Action;
+import org.omg.uml.behavioralelements.commonbehavior.ActionSequence;
+import org.omg.uml.behavioralelements.commonbehavior.Argument;
+import org.omg.uml.behavioralelements.commonbehavior.AttributeLink;
 import org.omg.uml.behavioralelements.commonbehavior.CallAction;
 import org.omg.uml.behavioralelements.commonbehavior.ComponentInstance;
 import org.omg.uml.behavioralelements.commonbehavior.CreateAction;
+import org.omg.uml.behavioralelements.commonbehavior.DataValue;
 import org.omg.uml.behavioralelements.commonbehavior.DestroyAction;
 import org.omg.uml.behavioralelements.commonbehavior.Instance;
 import org.omg.uml.behavioralelements.commonbehavior.Link;
+import org.omg.uml.behavioralelements.commonbehavior.LinkEnd;
+import org.omg.uml.behavioralelements.commonbehavior.LinkObject;
 import org.omg.uml.behavioralelements.commonbehavior.NodeInstance;
 import org.omg.uml.behavioralelements.commonbehavior.Reception;
 import org.omg.uml.behavioralelements.commonbehavior.ReturnAction;
 import org.omg.uml.behavioralelements.commonbehavior.SendAction;
 import org.omg.uml.behavioralelements.commonbehavior.Signal;
 import org.omg.uml.behavioralelements.commonbehavior.Stimulus;
+import org.omg.uml.behavioralelements.commonbehavior.SubsystemInstance;
 import org.omg.uml.behavioralelements.commonbehavior.TerminateAction;
 import org.omg.uml.behavioralelements.commonbehavior.UmlException;
+import org.omg.uml.behavioralelements.commonbehavior.UninterpretedAction;
+import org.omg.uml.behavioralelements.statemachines.CallEvent;
+import org.omg.uml.behavioralelements.statemachines.ChangeEvent;
 import org.omg.uml.behavioralelements.statemachines.CompositeState;
 import org.omg.uml.behavioralelements.statemachines.Event;
 import org.omg.uml.behavioralelements.statemachines.FinalState;
 import org.omg.uml.behavioralelements.statemachines.Guard;
 import org.omg.uml.behavioralelements.statemachines.Pseudostate;
+import org.omg.uml.behavioralelements.statemachines.SignalEvent;
 import org.omg.uml.behavioralelements.statemachines.SimpleState;
 import org.omg.uml.behavioralelements.statemachines.State;
 import org.omg.uml.behavioralelements.statemachines.StateMachine;
@@ -63,6 +79,7 @@
 import org.omg.uml.behavioralelements.statemachines.StubState;
 import org.omg.uml.behavioralelements.statemachines.SubmachineState;
 import org.omg.uml.behavioralelements.statemachines.SynchState;
+import org.omg.uml.behavioralelements.statemachines.TimeEvent;
 import org.omg.uml.behavioralelements.statemachines.Transition;
 import org.omg.uml.behavioralelements.usecases.Actor;
 import org.omg.uml.behavioralelements.usecases.Extend;
@@ -82,18 +99,25 @@
 import org.omg.uml.foundation.core.Constraint;
 import org.omg.uml.foundation.core.DataType;
 import org.omg.uml.foundation.core.Dependency;
+import org.omg.uml.foundation.core.Element;
+import org.omg.uml.foundation.core.ElementResidence;
 import org.omg.uml.foundation.core.Enumeration;
 import org.omg.uml.foundation.core.EnumerationLiteral;
+import org.omg.uml.foundation.core.Feature;
+import org.omg.uml.foundation.core.Flow;
 import org.omg.uml.foundation.core.GeneralizableElement;
 import org.omg.uml.foundation.core.Generalization;
 import org.omg.uml.foundation.core.Interface;
+import org.omg.uml.foundation.core.Method;
 import org.omg.uml.foundation.core.ModelElement;
 import org.omg.uml.foundation.core.Namespace;
 import org.omg.uml.foundation.core.Node;
 import org.omg.uml.foundation.core.Operation;
 import org.omg.uml.foundation.core.Parameter;
 import org.omg.uml.foundation.core.Permission;
+import org.omg.uml.foundation.core.Relationship;
 import org.omg.uml.foundation.core.Stereotype;
+import org.omg.uml.foundation.core.StructuralFeature;
 import org.omg.uml.foundation.core.TagDefinition;
 import org.omg.uml.foundation.core.TaggedValue;
 import org.omg.uml.foundation.core.TemplateArgument;
@@ -105,7 +129,9 @@
 import org.omg.uml.foundation.datatypes.AggregationKind;
 import org.omg.uml.foundation.datatypes.BooleanExpression;
 import org.omg.uml.foundation.datatypes.CallConcurrencyKind;
+import org.omg.uml.foundation.datatypes.Expression;
 import org.omg.uml.foundation.datatypes.Multiplicity;
+import org.omg.uml.foundation.datatypes.MultiplicityRange;
 import org.omg.uml.foundation.datatypes.ParameterDirectionKind;
 import org.omg.uml.foundation.datatypes.PseudostateKind;
 import org.omg.uml.foundation.datatypes.ScopeKind;
@@ -522,4 +548,105 @@
         return Interaction.class;
     }
 
+    public Object getActionSequence() {
+        return ActionSequence.class;
+    }
+
+    public Object getArgument() {
+        return Argument.class;
+    }
+
+    public Object getAttributeLink() {
+        return AttributeLink.class;
+    }
+
+    public Object getCallEvent() {
+        return CallEvent.class;
+    }
+
+    public Object getChangeEvent() {
+        return ChangeEvent.class;
+    }
+
+    public Object getClassifierInState() {
+        return ClassifierInState.class;
+    }
+
+    public Object getCollaborationInstanceSet() {
+        return CollaborationInstanceSet.class;
+    }
+
+    public Object getDataValue() {
+        return DataValue.class;
+    }
+
+    public Object getElement() {
+        return Element.class;
+    }
+
+    public Object getElementResidence() {
+        return ElementResidence.class;
+    }
+
+    public Object getExpression() {
+        return Expression.class;
+    }
+
+    public Object getFeature() {
+        return Feature.class;
+    }
+
+    public Object getFlow() {
+        return Flow.class;
+    }
+
+    public Object getInteractionInstanceSet() {
+        return InteractionInstanceSet.class;
+    }
+
+    public Object getLinkEnd() {
+        return LinkEnd.class;
+    }
+
+    public Object getLinkObject() {
+        return LinkObject.class;
+    }
+
+    public Object getMethod() {
+        return Method.class;
+    }
+
+    public Object getMultiplicityRange() {
+        return MultiplicityRange.class;
+    }
+
+    public Object getPrimitiveType() {
+        return PrimitiveType.class;
+    }
+
+    public Object getRelationship() {
+        return Relationship.class;
+    }
+
+    public Object getSignalEvent() {
+        return SignalEvent.class;
+    }
+
+    public Object getStructuralFeature() {
+        return StructuralFeature.class;
+    }
+
+    public Object getSubsystemInstance() {
+        return SubsystemInstance.class;
+    }
+
+    public Object getTimeEvent() {
+        return TimeEvent.class;
+    }
+
+    public Object getUninterpretedAction() {
+        return UninterpretedAction.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=16418&r1=16417&r2=16418
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java	(original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java	2008-12-22 14:22:17-0800
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2005-2007 The Regents of the University of California. All
+// Copyright (c) 2005-2008 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
@@ -516,4 +516,54 @@
      */
     Object getInteraction();
 
+    Object getActionSequence();
+
+    Object getArgument();
+
+    Object getAttributeLink();
+
+    Object getCallEvent();
+
+    Object getChangeEvent();
+
+    Object getClassifierInState();
+
+    Object getCollaborationInstanceSet();
+
+    Object getDataValue();
+
+    Object getElement();
+
+    Object getElementResidence();
+
+    Object getExpression();
+
+    Object getFeature();
+
+    Object getFlow();
+
+    Object getInteractionInstanceSet();
+
+    Object getLinkEnd();
+
+    Object getLinkObject();
+
+    Object getMethod();
+
+    Object getMultiplicityRange();
+
+    Object getPrimitiveType();
+
+    Object getRelationship();
+
+    Object getSignalEvent();
+
+    Object getStructuralFeature();
+
+    Object getSubsystemInstance();
+
+    Object getTimeEvent();
+
+    Object getUninterpretedAction();
+
 }

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

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