Author: bobtarling
Date: 2011-05-15 11:58:35-0700
New Revision: 19435
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:
Metatype and recognizers for LiteralBoolean, LiteralInteger, LiteralString and OpaqueExpression
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=19435&r1=19434&r2=19435
==============================================================================
--- 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 2011-05-15 11:58:35-0700
@@ -2155,6 +2155,18 @@
throw new NotYetImplementedException();
}
+ public boolean isALiteralBoolean(Object handle) {
+ return handle instanceof LiteralBoolean;
+ }
+
+ public boolean isALiteralInteger(Object handle) {
+ return handle instanceof LiteralInteger;
+ }
+
+ public boolean isALiteralString(Object handle) {
+ return handle instanceof LiteralString;
+ }
+
public boolean isAMessage(Object handle) {
return handle instanceof Message;
}
@@ -2219,6 +2231,10 @@
return handle instanceof ObjectNode;
}
+ public boolean isAOpaqueExpression(Object handle) {
+ return handle instanceof Operation;
+ }
+
public boolean isAOperation(Object handle) {
return handle instanceof Operation;
}
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=19435&r1=19434&r2=19435
==============================================================================
--- 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 2011-05-15 11:58:35-0700
@@ -68,12 +68,16 @@
import org.eclipse.uml2.uml.InteractionConstraint;
import org.eclipse.uml2.uml.Interface;
import org.eclipse.uml2.uml.Lifeline;
+import org.eclipse.uml2.uml.LiteralBoolean;
+import org.eclipse.uml2.uml.LiteralInteger;
+import org.eclipse.uml2.uml.LiteralString;
import org.eclipse.uml2.uml.Message;
import org.eclipse.uml2.uml.Model;
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.OpaqueExpression;
import org.eclipse.uml2.uml.Operation;
import org.eclipse.uml2.uml.OutputPin;
import org.eclipse.uml2.uml.PackageImport;
@@ -450,6 +454,10 @@
throw new NotImplementedException("This is not a UML1.4 class"); //$NON-NLS-1$
}
+ public Object getOpaqueExpression() {
+ return OpaqueExpression.class;
+ }
+
public Object getOperation() {
return Operation.class;
}
@@ -670,8 +678,8 @@
}
public Object getElementResidence() {
- // TODO: Need UML 2.x equivalent
- return null /*ElementResidence.class*/;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getExpression() {
@@ -687,13 +695,13 @@
}
public Object getFlow() {
- // TODO: Need UML 2.x equivalent
- return null /*Flow.class*/;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getInteractionInstanceSet() {
- // TODO: Need UML 2.x equivalent
- return null /*InteractionInstanceSet.class*/;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getLifeline() {
@@ -701,20 +709,32 @@
}
public Object getLinkEnd() {
- // TODO: Need UML 2.x equivalent
- return null /*LinkEnd.class*/;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getLinkObject() {
- // TODO: Need UML 2.x equivalent
- return null /*LinkObject.class*/;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
- public Object getMethod() {
- // TODO: Need UML 2.x equivalent
- return null /*Method.class*/;
+ public Object getLiteralBoolean() {
+ return LiteralBoolean.class;
+ }
+
+ public Object getLiteralInteger() {
+ return LiteralInteger.class;
+ }
+
+ public Object getLiteralString() {
+ return LiteralString.class;
}
+ public Object getMethod() {
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
+ }
+
public Object getMultiplicityRange() {
return MultiplicityElement.class;
}
@@ -736,8 +756,8 @@
}
public Object getSubsystemInstance() {
- // TODO: Need UML 2.x equivalent
- return null /*SubsystemInstance.class*/;
+ throw new NotImplementedException(
+ "Not a UML2 model element"); //$NON-NLS-1$
}
public Object getTimeEvent() {
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=19435&r1=19434&r2=19435
==============================================================================
--- 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 2011-05-15 11:58:35-0700
@@ -556,6 +556,18 @@
return handle instanceof LinkObject;
}
+ public boolean isALiteralBoolean(Object handle) {
+ return false;
+ }
+
+ public boolean isALiteralInteger(Object handle) {
+ return false;
+ }
+
+ public boolean isALiteralString(Object handle) {
+ return false;
+ }
+
public boolean isAMessage(Object handle) {
return handle instanceof Message;
}
@@ -607,6 +619,10 @@
return handle instanceof Operation;
}
+ public boolean isAOpaqueExpression(Object handle) {
+ return false;
+ }
+
public boolean isAObject(Object handle) {
return handle
instanceof org.omg.uml.behavioralelements.commonbehavior.Object;
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=19435&r1=19434&r2=19435
==============================================================================
--- 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 2011-05-15 11:58:35-0700
@@ -492,6 +492,10 @@
return Operation.class;
}
+ public Object getOpaqueExpression() {
+ throw new NotImplementedException("Not a UML 1.4 element");
+ }
+
public Object getOutputPin() {
throw new NotImplementedException("Not a UML1.4 element");
}
@@ -708,6 +712,18 @@
return LinkObject.class;
}
+ public Object getLiteralBoolean() {
+ throw new NotImplementedException("Not a UML 1.4 element");
+ }
+
+ public Object getLiteralInteger() {
+ throw new NotImplementedException("Not a UML 1.4 element");
+ }
+
+ public Object getLiteralString() {
+ throw new NotImplementedException("Not a UML 1.4 element");
+ }
+
public Object getMethod() {
return Method.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=19435&r1=19434&r2=19435
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/Facade.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/Facade.java 2011-05-15 11:58:35-0700
@@ -790,6 +790,30 @@
boolean isALinkObject(Object handle);
/**
+ * Recognizer for LiteralBoolean
+ *
+ * @param handle candidate
+ * @return true if handle is a LiteralBoolean
+ */
+ boolean isALiteralBoolean(Object handle);
+
+ /**
+ * Recognizer for LiteralString
+ *
+ * @param handle candidate
+ * @return true if handle is a LiteralString
+ */
+ boolean isALiteralInteger(Object handle);
+
+ /**
+ * Recognizer for LiteralString
+ *
+ * @param handle candidate
+ * @return true if handle is a LiteralString
+ */
+ boolean isALiteralString(Object handle);
+
+ /**
* Recognizer for Message.
*
* @param handle candidate
@@ -890,6 +914,14 @@
boolean isANodeInstance(Object handle);
/**
+ * Recognizer for OpaqueExpression.
+ *
+ * @param handle candidate
+ * @return true if handle is an OpaqueExpression
+ */
+ boolean isAOpaqueExpression(Object handle);
+
+ /**
* Recognizer for Operation.
*
* @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=19435&r1=19434&r2=19435
==============================================================================
--- trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java (original)
+++ trunk/src/argouml-core-model/src/org/argouml/model/MetaTypes.java 2011-05-15 11:58:35-0700
@@ -422,6 +422,11 @@
Object getObjectFlow();
/**
+ * @return Returns the OpaqueExpression
+ */
+ Object getOpaqueExpression();
+
+ /**
* @return Returns the Operation.
*/
Object getOperation();
@@ -658,6 +663,12 @@
Object getLinkObject();
+ Object getLiteralBoolean();
+
+ Object getLiteralInteger();
+
+ Object getLiteralString();
+
Object getMethod();
Object getMultiplicityRange();
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2737603
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.