Author: bobtarling
Date: 2010-08-24 16:26:18-0700
New Revision: 18681
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/StateMachinesFactoryEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesHelperEUMLImpl.java
trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/UmlFactoryEUMLImpl.java
Log:
Some implementations for state diagrams
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=18681&r1=18680&r2=18681
==============================================================================
--- 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-08-24 16:26:18-0700
@@ -594,7 +594,10 @@
}
public Object getContext(Object handle) {
- throw new NotYetImplementedException();
+ if (isAStateMachine(handle)) {
+ return ((StateMachine) handle).getContext();
+ }
+ throw new IllegalArgumentException("handle must be a state machine");
}
public Collection getContexts(Object handle) {
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java?view=diff&pathrev=18681&r1=18680&r2=18681
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesFactoryEUMLImpl.java 2010-08-24 16:26:18-0700
@@ -13,6 +13,11 @@
import org.argouml.model.AbstractModelFactory;
import org.argouml.model.StateMachinesFactory;
+import org.eclipse.uml2.uml.BehavioredClassifier;
+import org.eclipse.uml2.uml.Classifier;
+import org.eclipse.uml2.uml.Element;
+import org.eclipse.uml2.uml.ProtocolStateMachine;
+import org.eclipse.uml2.uml.StateMachine;
import org.eclipse.uml2.uml.UMLFactory;
/**
@@ -115,9 +120,14 @@
}
public Object buildStateMachine(Object oContext) {
- // TODO: Auto-generated method stub
- throw new NotYetImplementedException();
+ BehavioredClassifier bc = (BehavioredClassifier) oContext;
+ StateMachine machine = (StateMachine) createStateMachine();
+ bc.setClassifierBehavior(machine);
+
+ bc.getOwnedElements().add(machine);
+ Element o2 = machine.getOwner();
+ return machine;
}
public Object buildStubState(Object compositeState) {
Modified: trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesHelperEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesHelperEUMLImpl.java?view=diff&pathrev=18681&r1=18680&r2=18681
==============================================================================
--- trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesHelperEUMLImpl.java (original)
+++ trunk/src/argouml-core-model-euml/src/org/argouml/model/euml/StateMachinesHelperEUMLImpl.java 2010-08-24 16:26:18-0700
@@ -13,7 +13,10 @@
import java.util.Collection;
+import org.argouml.model.InvalidElementException;
+import org.argouml.model.Model;
import org.argouml.model.StateMachinesHelper;
+import org.eclipse.uml2.uml.Classifier;
import org.eclipse.uml2.uml.State;
/**
@@ -104,9 +107,24 @@
}
public Object getStateMachine(Object handle) {
- // TODO: Auto-generated method stub
- throw new NotYetImplementedException();
-
+ if (handle == null) {
+ throw new IllegalArgumentException("bad argument to "
+ + "getStateMachine() - " + handle);
+ }
+ Object container =
+ modelImpl.getFacade().getModelElementContainer(handle);
+ while (container != null) {
+ if (Model.getFacade().isAStateMachine(container)) {
+ return container;
+ }
+ container =
+ modelImpl.getFacade()
+ .getModelElementContainer(container);
+ }
+ /* In this case, either the container was not set,
+ * or it was not contained in a statemachine.
+ */
+ return null;
}
public Object getStatebyName(String path, Object container) {
@@ -122,9 +140,7 @@
}
public boolean isAddingStatemachineAllowed(Object context) {
- // TODO: Auto-generated method stub
- throw new NotYetImplementedException();
-
+ return (context instanceof Classifier);
}
public boolean isTopState(Object o) {
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=18681&r1=18680&r2=18681
==============================================================================
--- 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-08-24 16:26:18-0700
@@ -329,10 +329,8 @@
o = UMLFactory.eINSTANCE.createInputPin();
} else if (elementType == metaTypes.getOutputPin()) {
o = UMLFactory.eINSTANCE.createOutputPin();
- } else if (elementType == metaTypes.getSimpleState()) {
- o = modelImpl.getStateMachinesFactory().createSimpleState();
- } else if (elementType == metaTypes.getFinalState()) {
- o = modelImpl.getStateMachinesFactory().createFinalState();
+ } else if (elementType == metaTypes.getState()) {
+ o = UMLFactory.eINSTANCE.createState();
} else if (elementType == metaTypes.getPseudostate()) {
o = modelImpl.getStateMachinesFactory().createPseudostate();
} else if (elementType == metaTypes.getObjectFlowState()) {
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2650805
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.