Author: bobtarling
Date: 2010-07-19 13:45:09-0700
New Revision: 18535
Modified:
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/MetaTypesEUMLImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/MetaTypesMDRImpl.java
trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java
Log:
Meta types and recognizers for SendSignalAction and AcceptSignalAction
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java?view=diff&pathrev=18535&r1=18534&r2=18535
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java 2010-07-19 13:45:09-0700
@@ -35,6 +35,7 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.AcceptEventAction;
import org.eclipse.uml2.uml.Action;
import org.eclipse.uml2.uml.ActivityEdge;
import org.eclipse.uml2.uml.ActivityNode;
@@ -1603,6 +1604,10 @@
return handle instanceof Action;
}
+ public boolean isAAcceptEventAction(Object handle) {
+ return handle instanceof AcceptEventAction;
+ }
+
public boolean isAActionSequence(Object handle) {
// Gone in UML 2.x
return false;
@@ -2020,9 +2025,16 @@
}
public boolean isASendAction(Object handle) {
- // TODO: Do we want both here? - tfm
- return handle instanceof SendObjectAction
- || handle instanceof SendSignalAction;
+ // Not in UML2
+ return false;
+ }
+
+ public boolean isASendObjectAction(Object handle) {
+ return handle instanceof SendObjectAction;
+ }
+
+ public boolean isASendSignalAction(Object handle) {
+ return handle instanceof SendSignalAction;
}
public boolean isASignal(Object handle) {
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=18535&r1=18534&r2=18535
==============================================================================
--- 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-19 13:45:09-0700
@@ -16,6 +16,7 @@
import org.argouml.model.MetaTypes;
import org.argouml.model.NotImplementedException;
import org.eclipse.uml2.uml.Abstraction;
+import org.eclipse.uml2.uml.AcceptEventAction;
import org.eclipse.uml2.uml.Action;
import org.eclipse.uml2.uml.Activity;
import org.eclipse.uml2.uml.ActivityParameterNode;
@@ -77,6 +78,7 @@
import org.eclipse.uml2.uml.PseudostateKind;
import org.eclipse.uml2.uml.Reception;
import org.eclipse.uml2.uml.Relationship;
+import org.eclipse.uml2.uml.SendSignalAction;
import org.eclipse.uml2.uml.Signal;
import org.eclipse.uml2.uml.SignalEvent;
import org.eclipse.uml2.uml.State;
@@ -122,6 +124,10 @@
return Action.class;
}
+ public Object getAcceptEventAction() {
+ return AcceptEventAction.class;
+ }
+
public Object getActionExpression() {
// TODO: Auto-generated method stub
throw new NotYetImplementedException();
@@ -478,13 +484,17 @@
}
public Object getScopeKind() {
- // Not in UML 2.x - deprecated in Model API
- throw new NotImplementedException();
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getSendAction() {
- // TODO: Auto-generated method stub
- throw new NotYetImplementedException();
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
+ }
+
+ public Object getSendSignalAction() {
+ return SendSignalAction.class;
}
public Object getSignal() {
@@ -492,8 +502,8 @@
}
public Object getSimpleState() {
- // TODO: Gone in UML 2.1
- return State.class;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getState() {
Modified: trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java?view=diff&pathrev=18535&r1=18534&r2=18535
==============================================================================
--- trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java (original)
+++ trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java 2010-07-19 13:45:09-0700
@@ -228,6 +228,10 @@
return handle instanceof Abstraction;
}
+ public boolean isAAcceptEventAction(Object handle) {
+ return false; // Not in UML1.4
+ }
+
public boolean isAAction(Object handle) {
return handle instanceof Action;
}
@@ -703,6 +707,10 @@
return handle instanceof SendAction;
}
+ public boolean isASendSignalAction(Object handle) {
+ return false; // Not in UML1.4
+ }
+
public boolean isASignal(Object handle) {
return handle instanceof Signal;
}
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=18535&r1=18534&r2=18535
==============================================================================
--- 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-19 13:45:09-0700
@@ -208,6 +208,10 @@
return Abstraction.class;
}
+ public Object getAcceptEventAction() {
+ throw new NotImplementedException("Not a UML 1.4 element");
+ }
+
public Object getAction() {
return Action.class;
}
@@ -520,6 +524,10 @@
return SendAction.class;
}
+ public Object getSendSignalAction() {
+ throw new NotImplementedException("Not a UML 1.4 element");
+ }
+
public Object getSignal() {
return Signal.class;
}
Modified: trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model/src/org/argouml/model/Facade.java?view=diff&pathrev=18535&r1=18534&r2=18535
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java 2010-07-19 13:45:09-0700
@@ -124,6 +124,14 @@
boolean isAAction(Object handle);
/**
+ * Recognizer for a UML2 AcceptEventAction.
+ *
+ * @param handle candidate
+ * @return true if handle is an AcceptEventAction
+ */
+ boolean isAAcceptEventAction(Object handle);
+
+ /**
* Recognizer for ActionSequence.
*
* @param handle candidate
@@ -942,6 +950,14 @@
boolean isASendAction(Object handle);
/**
+ * Recognizer for UML2 SendSignalAction.
+ *
+ * @param handle candidate
+ * @return true if handle is a SendSignalAction
+ */
+ boolean isASendSignalAction(Object handle);
+
+ /**
* Recognizer for Signal.
*
* @param handle candidate
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=18535&r1=18534&r2=18535
==============================================================================
--- 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-19 13:45:09-0700
@@ -67,6 +67,11 @@
Object getAbstraction();
/**
+ * @return Returns the SendSignalAction.
+ */
+ Object getAcceptEventAction();
+
+ /**
* @return Returns the Action.
*/
Object getAction();
@@ -464,6 +469,11 @@
Object getSendAction();
/**
+ * @return Returns the SendSignalAction.
+ */
+ Object getSendSignalAction();
+
+ /**
* @return Returns the Signal.
*/
Object getSignal();
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2635360
To unsubscribe from this discussion, e-mail: [[email protected]].
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.