Author: bobtarling Date: 2010-07-17 09:23:44-0700 New Revision: 18526 Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/FacadeEUMLImpl.java trunk/src/argouml-core-model-mdr/src/org/argouml/model/mdr/FacadeMDRImpl.java trunk/src/argouml-core-model/src/org/argouml/model/Facade.java
Log: Recognisers for ActivityEdge and ActivityNode 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=18526&r1=18525&r2=18526 ============================================================================== --- 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-17 09:23:44-0700 @@ -36,6 +36,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil; import org.eclipse.uml2.uml.Abstraction; import org.eclipse.uml2.uml.Action; +import org.eclipse.uml2.uml.ActivityEdge; import org.eclipse.uml2.uml.ActivityNode; import org.eclipse.uml2.uml.ActivityPartition; import org.eclipse.uml2.uml.Actor; @@ -1603,22 +1604,28 @@ } public boolean isAActionSequence(Object handle) { - // TODO: gone in UML 2.x + // Gone in UML 2.x return false; } public boolean isAActionState(Object handle) { - // TODO: ActionState, CallState, and SubactivityState have been replaced + // ActionState, CallState, and SubactivityState have been replaced // in UML 2.0 by explicitly modeled Actions return false; } + public boolean isAActivityEdge(Object handle) { + return handle instanceof ActivityEdge; + } + public boolean isAActivityGraph(Object handle) { - // TODO: Just a guess - double check - tfm; -// return handle instanceof ActivityGroup; return false; } + public boolean isAActivityNode(Object handle) { + return handle instanceof ActivityNode; + } + public boolean isAActor(Object handle) { return handle instanceof Actor; } 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=18526&r1=18525&r2=18526 ============================================================================== --- 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-17 09:23:44-0700 @@ -332,11 +332,18 @@ } } - + public boolean isAActivityEdge(Object handle) { + return false; // Not in UML1.4 + } + public boolean isAActivityGraph(Object handle) { return handle instanceof ActivityGraph; } + public boolean isAActivityNode(Object handle) { + return false; // Not in UML1.4 + } + public boolean isABehavioralFeature(Object handle) { return handle instanceof BehavioralFeature; } 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=18526&r1=18525&r2=18526 ============================================================================== --- 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-17 09:23:44-0700 @@ -256,7 +256,15 @@ boolean isAbstract(Object handle); /** - * Recognizer for ActivityGraph. + * Recognizer for UML2 ActivityEdge. + * + * @param handle candidate + * @return true if handle is ActivityEdge. + */ + boolean isAActivityEdge(Object handle); + + /** + * Recognizer for UML1.4 ActivityGraph. * * @param handle candidate * @return true if handle is ActivityGraph. @@ -264,6 +272,14 @@ boolean isAActivityGraph(Object handle); /** + * Recognizer for UML2 ActivityNode. + * + * @param handle candidate + * @return true if handle is ActivityNode. + */ + boolean isAActivityNode(Object handle); + + /** * Recognizer for BehavioralFeature. * * @param handle candidate ------------------------------------------------------ http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2634469 To unsubscribe from this discussion, e-mail: [[email protected]].
