Author: guixl
Date: Wed Jun 9 15:58:12 2010
New Revision: 953052
URL: http://svn.apache.org/viewvc?rev=953052&view=rev
Log:
change data model - remove initial state in service template, only state has
initial state node
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java?rev=953052&r1=953051&r2=953052&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ModelingPackage.java
Wed Jun 9 15:58:12 2010
@@ -483,22 +483,13 @@ public interface ModelingPackage extends
int SERVICE_TEMPLATE__EXMODE = 7;
/**
- * The feature id for the '<em><b>Initial State</b></em>' containment
reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SERVICE_TEMPLATE__INITIAL_STATE = 8;
-
- /**
* The feature id for the '<em><b>Final State</b></em>' containment
reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SERVICE_TEMPLATE__FINAL_STATE = 9;
+ int SERVICE_TEMPLATE__FINAL_STATE = 8;
/**
* The feature id for the '<em><b>Parallel</b></em>' containment
reference list.
@@ -507,7 +498,7 @@ public interface ModelingPackage extends
* @generated
* @ordered
*/
- int SERVICE_TEMPLATE__PARALLEL = 10;
+ int SERVICE_TEMPLATE__PARALLEL = 9;
/**
* The feature id for the '<em><b>Data Model</b></em>' containment
reference list.
@@ -516,7 +507,7 @@ public interface ModelingPackage extends
* @generated
* @ordered
*/
- int SERVICE_TEMPLATE__DATA_MODEL = 11;
+ int SERVICE_TEMPLATE__DATA_MODEL = 10;
/**
* The feature id for the '<em><b>Script</b></em>' containment
reference.
@@ -525,7 +516,7 @@ public interface ModelingPackage extends
* @generated
* @ordered
*/
- int SERVICE_TEMPLATE__SCRIPT = 12;
+ int SERVICE_TEMPLATE__SCRIPT = 11;
/**
* The number of structural features of the '<em>Service Template</em>'
class.
@@ -534,7 +525,7 @@ public interface ModelingPackage extends
* @generated
* @ordered
*/
- int SERVICE_TEMPLATE_FEATURE_COUNT = 13;
+ int SERVICE_TEMPLATE_FEATURE_COUNT = 12;
/**
* The meta object id for the '{...@link
org.apache.commons.scxml.modeling.impl.OnEntryImpl <em>On Entry</em>}' class.
@@ -2114,17 +2105,6 @@ public interface ModelingPackage extends
EAttribute getServiceTemplate_Exmode();
/**
- * Returns the meta object for the containment reference '{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getInitialState <em>Initial
State</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference '<em>Initial
State</em>'.
- * @see
org.apache.commons.scxml.modeling.ServiceTemplate#getInitialState()
- * @see #getServiceTemplate()
- * @generated
- */
- EReference getServiceTemplate_InitialState();
-
- /**
* Returns the meta object for the containment reference list
'{...@link org.apache.commons.scxml.modeling.ServiceTemplate#getFinalState
<em>Final State</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -3498,14 +3478,6 @@ public interface ModelingPackage extends
EAttribute SERVICE_TEMPLATE__EXMODE =
eINSTANCE.getServiceTemplate_Exmode();
/**
- * The meta object literal for the '<em><b>Initial
State</b></em>' containment reference feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference SERVICE_TEMPLATE__INITIAL_STATE =
eINSTANCE.getServiceTemplate_InitialState();
-
- /**
* The meta object literal for the '<em><b>Final
State</b></em>' containment reference list feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java?rev=953052&r1=953051&r2=953052&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/ServiceTemplate.java
Wed Jun 9 15:58:12 2010
@@ -38,7 +38,6 @@ import org.eclipse.emf.ecore.EObject;
* <li>{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getVersion
<em>Version</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getProfile
<em>Profile</em>}</li>
* <li>{...@link org.apache.commons.scxml.modeling.ServiceTemplate#getExmode
<em>Exmode</em>}</li>
- * <li>{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getInitialState <em>Initial
State</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getFinalState <em>Final
State</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getParallel
<em>Parallel</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getDataModel <em>Data
Model</em>}</li>
@@ -240,32 +239,6 @@ public interface ServiceTemplate extends
void setExmode(String value);
/**
- * Returns the value of the '<em><b>Initial State</b></em>' containment
reference.
- * <!-- begin-user-doc -->
- * <p>
- * If the meaning of the '<em>Initial State</em>' containment reference
isn't clear,
- * there really should be more of a description here...
- * </p>
- * <!-- end-user-doc -->
- * @return the value of the '<em>Initial State</em>' containment
reference.
- * @see #setInitialState(InitialState)
- * @see
org.apache.commons.scxml.modeling.ModelingPackage#getServiceTemplate_InitialState()
- * @model containment="true"
- * @generated
- */
- InitialState getInitialState();
-
- /**
- * Sets the value of the '{...@link
org.apache.commons.scxml.modeling.ServiceTemplate#getInitialState <em>Initial
State</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @param value the new value of the '<em>Initial State</em>'
containment reference.
- * @see #getInitialState()
- * @generated
- */
- void setInitialState(InitialState value);
-
- /**
* Returns the value of the '<em><b>Final State</b></em>' containment
reference list.
* The list contents are of type {...@link
org.apache.commons.scxml.modeling.FinalState}.
* <!-- begin-user-doc -->
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java?rev=953052&r1=953051&r2=953052&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/State.java
Wed Jun 9 15:58:12 2010
@@ -182,7 +182,7 @@ public interface State extends NamedElem
* The list contents are of type {...@link
org.apache.commons.scxml.modeling.State}.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of the '<em>Sub State</em>' containment reference
isn't clear,
+ * If the meaning of the '<em>Sub State</em>' containment reference
list isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java?rev=953052&r1=953051&r2=953052&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ModelingPackageImpl.java
Wed Jun 9 15:58:12 2010
@@ -672,17 +672,8 @@ public class ModelingPackageImpl extends
* <!-- end-user-doc -->
* @generated
*/
- public EReference getServiceTemplate_InitialState() {
- return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(8);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public EReference getServiceTemplate_FinalState() {
- return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(9);
+ return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(8);
}
/**
@@ -691,7 +682,7 @@ public class ModelingPackageImpl extends
* @generated
*/
public EReference getServiceTemplate_Parallel() {
- return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(10);
+ return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(9);
}
/**
@@ -700,7 +691,7 @@ public class ModelingPackageImpl extends
* @generated
*/
public EReference getServiceTemplate_DataModel() {
- return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(11);
+ return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(10);
}
/**
@@ -709,7 +700,7 @@ public class ModelingPackageImpl extends
* @generated
*/
public EReference getServiceTemplate_Script() {
- return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(12);
+ return
(EReference)serviceTemplateEClass.getEStructuralFeatures().get(11);
}
/**
@@ -1626,7 +1617,6 @@ public class ModelingPackageImpl extends
createEAttribute(serviceTemplateEClass,
SERVICE_TEMPLATE__VERSION);
createEAttribute(serviceTemplateEClass,
SERVICE_TEMPLATE__PROFILE);
createEAttribute(serviceTemplateEClass,
SERVICE_TEMPLATE__EXMODE);
- createEReference(serviceTemplateEClass,
SERVICE_TEMPLATE__INITIAL_STATE);
createEReference(serviceTemplateEClass,
SERVICE_TEMPLATE__FINAL_STATE);
createEReference(serviceTemplateEClass,
SERVICE_TEMPLATE__PARALLEL);
createEReference(serviceTemplateEClass,
SERVICE_TEMPLATE__DATA_MODEL);
@@ -1834,7 +1824,6 @@ public class ModelingPackageImpl extends
initEAttribute(getServiceTemplate_Version(),
ecorePackage.getEString(), "version", null, 0, 1, ServiceTemplate.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getServiceTemplate_Profile(),
ecorePackage.getEString(), "profile", null, 0, 1, ServiceTemplate.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
initEAttribute(getServiceTemplate_Exmode(),
ecorePackage.getEString(), "exmode", null, 0, 1, ServiceTemplate.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
!IS_DERIVED, IS_ORDERED);
- initEReference(getServiceTemplate_InitialState(),
this.getInitialState(), null, "initialState", null, 0, 1,
ServiceTemplate.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE,
IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED,
IS_ORDERED);
initEReference(getServiceTemplate_FinalState(),
this.getFinalState(), null, "finalState", null, 0, -1, ServiceTemplate.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getServiceTemplate_Parallel(),
this.getParallel(), null, "parallel", null, 0, -1, ServiceTemplate.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEReference(getServiceTemplate_DataModel(),
this.getDataModel(), null, "dataModel", null, 0, -1, ServiceTemplate.class,
!IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES,
!IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
Modified:
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java?rev=953052&r1=953051&r2=953052&view=diff
==============================================================================
---
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java
(original)
+++
commons/sandbox/gsoc/2010/scxml-eclipse/trunk/src/main/java/org.apache.commons.scxml.modeling/src/org/apache/commons/scxml/modeling/impl/ServiceTemplateImpl.java
Wed Jun 9 15:58:12 2010
@@ -22,7 +22,6 @@ import java.util.Collection;
import org.apache.commons.scxml.modeling.DataModel;
import org.apache.commons.scxml.modeling.FinalState;
-import org.apache.commons.scxml.modeling.InitialState;
import org.apache.commons.scxml.modeling.ModelingPackage;
import org.apache.commons.scxml.modeling.Parallel;
import org.apache.commons.scxml.modeling.Script;
@@ -59,7 +58,6 @@ import org.eclipse.emf.ecore.util.Intern
* <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getVersion
<em>Version</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getProfile
<em>Profile</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getExmode
<em>Exmode</em>}</li>
- * <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getInitialState
<em>Initial State</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getFinalState
<em>Final State</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getParallel
<em>Parallel</em>}</li>
* <li>{...@link
org.apache.commons.scxml.modeling.impl.ServiceTemplateImpl#getDataModel
<em>Data Model</em>}</li>
@@ -211,16 +209,6 @@ public class ServiceTemplateImpl extends
protected String exmode = EXMODE_EDEFAULT;
/**
- * The cached value of the '{...@link #getInitialState() <em>Initial
State</em>}' containment reference.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getInitialState()
- * @generated
- * @ordered
- */
- protected InitialState initialState;
-
- /**
* The cached value of the '{...@link #getFinalState() <em>Final
State</em>}' containment reference list.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -433,49 +421,6 @@ public class ServiceTemplateImpl extends
* <!-- end-user-doc -->
* @generated
*/
- public InitialState getInitialState() {
- return initialState;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public NotificationChain basicSetInitialState(InitialState
newInitialState, NotificationChain msgs) {
- InitialState oldInitialState = initialState;
- initialState = newInitialState;
- if (eNotificationRequired()) {
- ENotificationImpl notification = new
ENotificationImpl(this, Notification.SET,
ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE, oldInitialState,
newInitialState);
- if (msgs == null) msgs = notification; else
msgs.add(notification);
- }
- return msgs;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setInitialState(InitialState newInitialState) {
- if (newInitialState != initialState) {
- NotificationChain msgs = null;
- if (initialState != null)
- msgs =
((InternalEObject)initialState).eInverseRemove(this, EOPPOSITE_FEATURE_BASE -
ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE, null, msgs);
- if (newInitialState != null)
- msgs =
((InternalEObject)newInitialState).eInverseAdd(this, EOPPOSITE_FEATURE_BASE -
ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE, null, msgs);
- msgs = basicSetInitialState(newInitialState, msgs);
- if (msgs != null) msgs.dispatch();
- }
- else if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET,
ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE, newInitialState,
newInitialState));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
public EList getFinalState() {
if (finalState == null) {
finalState = new
EObjectContainmentEList(FinalState.class, this,
ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE);
@@ -561,8 +506,6 @@ public class ServiceTemplateImpl extends
return
((InternalEList)getTransList()).basicRemove(otherEnd, msgs);
case ModelingPackage.SERVICE_TEMPLATE__STATE_LIST:
return
((InternalEList)getStateList()).basicRemove(otherEnd, msgs);
- case ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE:
- return basicSetInitialState(null, msgs);
case ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE:
return
((InternalEList)getFinalState()).basicRemove(otherEnd, msgs);
case ModelingPackage.SERVICE_TEMPLATE__PARALLEL:
@@ -598,8 +541,6 @@ public class ServiceTemplateImpl extends
return getProfile();
case ModelingPackage.SERVICE_TEMPLATE__EXMODE:
return getExmode();
- case ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE:
- return getInitialState();
case ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE:
return getFinalState();
case ModelingPackage.SERVICE_TEMPLATE__PARALLEL:
@@ -645,9 +586,6 @@ public class ServiceTemplateImpl extends
case ModelingPackage.SERVICE_TEMPLATE__EXMODE:
setExmode((String)newValue);
return;
- case ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE:
- setInitialState((InitialState)newValue);
- return;
case ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE:
getFinalState().clear();
getFinalState().addAll((Collection)newValue);
@@ -698,9 +636,6 @@ public class ServiceTemplateImpl extends
case ModelingPackage.SERVICE_TEMPLATE__EXMODE:
setExmode(EXMODE_EDEFAULT);
return;
- case ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE:
- setInitialState((InitialState)null);
- return;
case ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE:
getFinalState().clear();
return;
@@ -740,8 +675,6 @@ public class ServiceTemplateImpl extends
return PROFILE_EDEFAULT == null ? profile !=
null : !PROFILE_EDEFAULT.equals(profile);
case ModelingPackage.SERVICE_TEMPLATE__EXMODE:
return EXMODE_EDEFAULT == null ? exmode != null
: !EXMODE_EDEFAULT.equals(exmode);
- case ModelingPackage.SERVICE_TEMPLATE__INITIAL_STATE:
- return initialState != null;
case ModelingPackage.SERVICE_TEMPLATE__FINAL_STATE:
return finalState != null &&
!finalState.isEmpty();
case ModelingPackage.SERVICE_TEMPLATE__PARALLEL:
