summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRainer Pielmann2012-10-16 07:49:13 (EDT)
committer Stephan Born2012-10-16 07:49:13 (EDT)
commit5a092a01ae349741a2cf97fbce3f60fa3be193e6 (patch)
tree626fed9ad3b9ec42dcfa4ef6007b9a7bf241e0cf
parent370963943548fc393e175b463c139e0d96a98b14 (diff)
downloadorg.eclipse.stardust.ide-5a092a01ae349741a2cf97fbce3f60fa3be193e6.zip
org.eclipse.stardust.ide-5a092a01ae349741a2cf97fbce3f60fa3be193e6.tar.gz
org.eclipse.stardust.ide-5a092a01ae349741a2cf97fbce3f60fa3be193e6.tar.bz2
Jira-ID: CRNT-26638
Identify way to assign Label to StartEventSymbol and persist in xpdl git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ide@60068 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--model/org.eclipse.stardust.model.xpdl/model/carnot.ecore1
-rw-r--r--model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/AbstractEventSymbol.java32
-rw-r--r--model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CarnotWorkflowModelPackage.java66
-rw-r--r--model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventSymbolImpl.java131
-rw-r--r--model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java38
-rw-r--r--model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java16
-rw-r--r--model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/carnot.ecore1
7 files changed, 261 insertions, 24 deletions
diff --git a/model/org.eclipse.stardust.model.xpdl/model/carnot.ecore b/model/org.eclipse.stardust.model.xpdl/model/carnot.ecore
index 9719679..6c39723 100644
--- a/model/org.eclipse.stardust.model.xpdl/model/carnot.ecore
+++ b/model/org.eclipse.stardust.model.xpdl/model/carnot.ecore
@@ -833,6 +833,7 @@
<details key="name" value="abstractEventSymbol_._type"/>
<details key="kind" value="empty"/>
</eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AccessPointType" eSuperTypes="#//IIdentifiableModelElement #//ITypedElement">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/AbstractEventSymbol.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/AbstractEventSymbol.java
index 0538037..bd7b288 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/AbstractEventSymbol.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/AbstractEventSymbol.java
@@ -16,6 +16,12 @@ package org.eclipse.stardust.model.xpdl.carnot;
* A representation of the model object '<em><b>Abstract Event Symbol</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.stardust.model.xpdl.carnot.AbstractEventSymbol#getLabel <em>Label</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage#getAbstractEventSymbol()
* @model abstract="true"
@@ -30,4 +36,30 @@ public interface AbstractEventSymbol extends IFlowObjectSymbol, IModelElementNod
*/
String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
+ /**
+ * Returns the value of the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Label</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Label</em>' attribute.
+ * @see #setLabel(String)
+ * @see org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage#getAbstractEventSymbol_Label()
+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
+ * @generated
+ */
+ String getLabel();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.stardust.model.xpdl.carnot.AbstractEventSymbol#getLabel <em>Label</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Label</em>' attribute.
+ * @see #getLabel()
+ * @generated
+ */
+ void setLabel(String value);
+
} // AbstractEventSymbol
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CarnotWorkflowModelPackage.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CarnotWorkflowModelPackage.java
index 4ed338c..a7e6353 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CarnotWorkflowModelPackage.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/CarnotWorkflowModelPackage.java
@@ -2199,12 +2199,21 @@ public interface CarnotWorkflowModelPackage extends EPackage {
int ABSTRACT_EVENT_SYMBOL__OUT_TRANSITIONS = IFLOW_OBJECT_SYMBOL__OUT_TRANSITIONS;
/**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int ABSTRACT_EVENT_SYMBOL__LABEL = IFLOW_OBJECT_SYMBOL_FEATURE_COUNT + 0;
+
+ /**
* The number of structural features of the '<em>Abstract Event Symbol</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
* @ordered
*/
- int ABSTRACT_EVENT_SYMBOL_FEATURE_COUNT = IFLOW_OBJECT_SYMBOL_FEATURE_COUNT + 0;
+ int ABSTRACT_EVENT_SYMBOL_FEATURE_COUNT = IFLOW_OBJECT_SYMBOL_FEATURE_COUNT + 1;
/**
* The feature id for the '<em><b>Element Oid</b></em>' attribute. <!--
@@ -4994,6 +5003,15 @@ public interface CarnotWorkflowModelPackage extends EPackage {
int END_EVENT_SYMBOL__OUT_TRANSITIONS = ABSTRACT_EVENT_SYMBOL__OUT_TRANSITIONS;
/**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int END_EVENT_SYMBOL__LABEL = ABSTRACT_EVENT_SYMBOL__LABEL;
+
+ /**
* The number of structural features of the '<em>End Event Symbol</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
@@ -6385,6 +6403,15 @@ public interface CarnotWorkflowModelPackage extends EPackage {
int INTERMEDIATE_EVENT_SYMBOL__OUT_TRANSITIONS = ABSTRACT_EVENT_SYMBOL__OUT_TRANSITIONS;
/**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int INTERMEDIATE_EVENT_SYMBOL__LABEL = ABSTRACT_EVENT_SYMBOL__LABEL;
+
+ /**
* The number of structural features of the '<em>Intermediate Event Symbol</em>' class.
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
@@ -9037,6 +9064,15 @@ public interface CarnotWorkflowModelPackage extends EPackage {
int PUBLIC_INTERFACE_SYMBOL__OUT_TRANSITIONS = ABSTRACT_EVENT_SYMBOL__OUT_TRANSITIONS;
/**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int PUBLIC_INTERFACE_SYMBOL__LABEL = ABSTRACT_EVENT_SYMBOL__LABEL;
+
+ /**
* The number of structural features of the '<em>Public Interface Symbol</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -9625,6 +9661,15 @@ public interface CarnotWorkflowModelPackage extends EPackage {
int START_EVENT_SYMBOL__OUT_TRANSITIONS = ABSTRACT_EVENT_SYMBOL__OUT_TRANSITIONS;
/**
+ * The feature id for the '<em><b>Label</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int START_EVENT_SYMBOL__LABEL = ABSTRACT_EVENT_SYMBOL__LABEL;
+
+ /**
* The feature id for the '<em><b>Trigger</b></em>' reference.
* <!-- begin-user-doc
* --> <!-- end-user-doc -->
@@ -15490,6 +15535,17 @@ public interface CarnotWorkflowModelPackage extends EPackage {
EClass getAbstractEventSymbol();
/**
+ * Returns the meta object for the attribute '{@link org.eclipse.stardust.model.xpdl.carnot.AbstractEventSymbol#getLabel <em>Label</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Label</em>'.
+ * @see org.eclipse.stardust.model.xpdl.carnot.AbstractEventSymbol#getLabel()
+ * @see #getAbstractEventSymbol()
+ * @generated
+ */
+ EAttribute getAbstractEventSymbol_Label();
+
+ /**
* Returns the meta object for enum '{@link org.eclipse.stardust.model.xpdl.carnot.ImplementationType <em>Implementation Type</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -16574,6 +16630,14 @@ public interface CarnotWorkflowModelPackage extends EPackage {
EClass ABSTRACT_EVENT_SYMBOL = eINSTANCE.getAbstractEventSymbol();
/**
+ * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute ABSTRACT_EVENT_SYMBOL__LABEL = eINSTANCE.getAbstractEventSymbol_Label();
+
+ /**
* The meta object literal for the '{@link org.eclipse.stardust.model.xpdl.carnot.impl.AccessPointTypeImpl <em>Access Point Type</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventSymbolImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventSymbolImpl.java
index b8ca94b..c814538 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventSymbolImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/AbstractEventSymbolImpl.java
@@ -10,10 +10,12 @@
*******************************************************************************/
package org.eclipse.stardust.model.xpdl.carnot.impl;
+import org.eclipse.emf.common.notify.Notification;
import java.util.Arrays;
import java.util.List;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.stardust.model.xpdl.carnot.AbstractEventSymbol;
import org.eclipse.stardust.model.xpdl.carnot.CarnotWorkflowModelPackage;
@@ -25,6 +27,10 @@ import org.eclipse.stardust.model.xpdl.carnot.IIdentifiableModelElement;
* An implementation of the model object '<em><b>Abstract Event Symbol</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.stardust.model.xpdl.carnot.impl.AbstractEventSymbolImpl#getLabel <em>Label</em>}</li>
+ * </ul>
* </p>
*
* @generated
@@ -39,6 +45,25 @@ public abstract class AbstractEventSymbolImpl extends IFlowObjectSymbolImpl impl
public static final String copyright = "Copyright 2000-2009 by SunGard Systeme GmbH"; //$NON-NLS-1$
/**
+ * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getLabel()
+ * @generated
+ * @ordered
+ */
+ protected static final String LABEL_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getLabel() <em>Label</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getLabel()
+ * @generated
+ * @ordered
+ */
+ protected String label = LABEL_EDEFAULT;
+
+ /**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
@@ -64,6 +89,29 @@ public abstract class AbstractEventSymbolImpl extends IFlowObjectSymbolImpl impl
* <!-- end-user-doc -->
* @generated
*/
+ public String getLabel()
+ {
+ return label;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setLabel(String newLabel)
+ {
+ String oldLabel = label;
+ label = newLabel;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, CarnotWorkflowModelPackage.ABSTRACT_EVENT_SYMBOL__LABEL, oldLabel, label));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public IIdentifiableModelElement getModelElement()
{
// TODO: implement this method
@@ -86,6 +134,89 @@ public abstract class AbstractEventSymbolImpl extends IFlowObjectSymbolImpl impl
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType)
+ {
+ switch (featureID)
+ {
+ case CarnotWorkflowModelPackage.ABSTRACT_EVENT_SYMBOL__LABEL:
+ return getLabel();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue)
+ {
+ switch (featureID)
+ {
+ case CarnotWorkflowModelPackage.ABSTRACT_EVENT_SYMBOL__LABEL:
+ setLabel((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID)
+ {
+ switch (featureID)
+ {
+ case CarnotWorkflowModelPackage.ABSTRACT_EVENT_SYMBOL__LABEL:
+ setLabel(LABEL_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID)
+ {
+ switch (featureID)
+ {
+ case CarnotWorkflowModelPackage.ABSTRACT_EVENT_SYMBOL__LABEL:
+ return LABEL_EDEFAULT == null ? label != null : !LABEL_EDEFAULT.equals(label);
+ }
+ return super.eIsSet(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String toString()
+ {
+ if (eIsProxy()) return super.toString();
+
+ StringBuffer result = new StringBuffer(super.toString());
+ result.append(" (label: ");
+ result.append(label);
+ result.append(')');
+ return result.toString();
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated NOT
*/
public List getInConnectionFeatures()
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java
index 6e148c9..b321c13 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelFactoryImpl.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.impl.EFactoryImpl;
import org.eclipse.emf.ecore.plugin.EcorePlugin;
+import org.eclipse.stardust.model.xpdl.carnot.*;
import org.eclipse.stardust.model.xpdl.carnot.AccessPointType;
import org.eclipse.stardust.model.xpdl.carnot.ActivityImplementationType;
import org.eclipse.stardust.model.xpdl.carnot.ActivitySymbolType;
@@ -139,7 +140,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
{
try
{
- CarnotWorkflowModelFactory theCarnotWorkflowModelFactory = (CarnotWorkflowModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/workflowmodel/3.1"); //$NON-NLS-1$
+ CarnotWorkflowModelFactory theCarnotWorkflowModelFactory = (CarnotWorkflowModelFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.carnot.ag/workflowmodel/3.1");
if (theCarnotWorkflowModelFactory != null)
{
return theCarnotWorkflowModelFactory;
@@ -243,8 +244,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
case CarnotWorkflowModelPackage.WORKS_FOR_CONNECTION_TYPE: return createWorksForConnectionType();
case CarnotWorkflowModelPackage.XML_TEXT_NODE: return createXmlTextNode();
default:
-
- throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_CLASS_NULL_IS_NOT_A_VALID_CLASSIFIER, new Object[]{eClass.getName()}));
+ throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
}
@@ -318,8 +318,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
case CarnotWorkflowModelPackage.DIAGRAM_MODE_TYPE_OBJECT:
return createDiagramModeTypeObjectFromString(eDataType, initialValue);
default:
-
- throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_DATATYPE_NULL_IS_NOT_VALID_CLASSIFIER, new Object[]{eDataType.getName()}));
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
@@ -393,7 +392,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
case CarnotWorkflowModelPackage.DIAGRAM_MODE_TYPE_OBJECT:
return convertDiagramModeTypeObjectToString(eDataType, instanceValue);
default:
- throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_DATATYPE_NULL_IS_NOT_VALID_CLASSIFIER, new Object[]{eDataType.getName()}));
+ throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
}
}
@@ -1121,8 +1120,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public ActivityImplementationType createActivityImplementationTypeFromString(EDataType eDataType, String initialValue)
{
ActivityImplementationType result = ActivityImplementationType.get(initialValue);
- // throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1144,7 +1142,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public DirectionType createDirectionTypeFromString(EDataType eDataType, String initialValue)
{
DirectionType result = DirectionType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1166,7 +1164,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public FlowControlType createFlowControlTypeFromString(EDataType eDataType, String initialValue)
{
FlowControlType result = FlowControlType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1188,7 +1186,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public ImplementationType createImplementationTypeFromString(EDataType eDataType, String initialValue)
{
ImplementationType result = ImplementationType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1210,7 +1208,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public JoinSplitType createJoinSplitTypeFromString(EDataType eDataType, String initialValue)
{
JoinSplitType result = JoinSplitType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1232,7 +1230,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public LinkCardinality createLinkCardinalityFromString(EDataType eDataType, String initialValue)
{
LinkCardinality result = LinkCardinality.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue , eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1254,7 +1252,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public LinkColor createLinkColorFromString(EDataType eDataType, String initialValue)
{
LinkColor result = LinkColor.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1276,7 +1274,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public LinkLineStyle createLinkLineStyleFromString(EDataType eDataType, String initialValue)
{
LinkLineStyle result = LinkLineStyle.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1298,7 +1296,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public LinkEndStyle createLinkEndStyleFromString(EDataType eDataType, String initialValue)
{
LinkEndStyle result = LinkEndStyle.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1320,7 +1318,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public LoopType createLoopTypeFromString(EDataType eDataType, String initialValue)
{
LoopType result = LoopType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1342,7 +1340,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public OrientationType createOrientationTypeFromString(EDataType eDataType, String initialValue)
{
OrientationType result = OrientationType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1364,7 +1362,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public RoutingType createRoutingTypeFromString(EDataType eDataType, String initialValue)
{
RoutingType result = RoutingType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
@@ -1408,7 +1406,7 @@ public class CarnotWorkflowModelFactoryImpl extends EFactoryImpl
public DiagramModeType createDiagramModeTypeFromString(EDataType eDataType, String initialValue)
{
DiagramModeType result = DiagramModeType.get(initialValue);
- if (result == null) throw new IllegalArgumentException(MessageFormat.format(Model_Messages.EXC_THE_VALUE_NULL_IS_NOT_VALID_ENUMERATION_OF_ONE , new Object[]{initialValue ,eDataType.getName()}));
+ if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
return result;
}
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java
index 54c4d70..1372e14 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/CarnotWorkflowModelPackageImpl.java
@@ -804,7 +804,7 @@ public class CarnotWorkflowModelPackageImpl extends EPackageImpl
/**
* Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
- *
+ *
* <p>This method is used to initialize {@link CarnotWorkflowModelPackage#eINSTANCE} when that field is accessed.
* Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc --> <!-- end-user-doc -->
@@ -836,7 +836,7 @@ public class CarnotWorkflowModelPackageImpl extends EPackageImpl
// Mark meta-data to indicate it can't be changed
theCarnotWorkflowModelPackage.freeze();
-
+
// Update the registry and return the package
EPackage.Registry.INSTANCE.put(CarnotWorkflowModelPackage.eNS_URI, theCarnotWorkflowModelPackage);
return theCarnotWorkflowModelPackage;
@@ -4682,6 +4682,16 @@ public class CarnotWorkflowModelPackageImpl extends EPackageImpl
}
/**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getAbstractEventSymbol_Label()
+ {
+ return (EAttribute)getAbstractEventSymbol().getEStructuralFeatures().get(0);
+ }
+
+ /**
* <!-- begin-user-doc --> <!-- end-user-doc -->
* @generated
*/
@@ -5043,7 +5053,7 @@ public class CarnotWorkflowModelPackageImpl extends EPackageImpl
URL url = getClass().getResource(packageFilename);
if (url == null)
{
- throw new RuntimeException( MessageFormat.format(Model_Messages.EXC_MISSING_SERIALIZED_PACKAGE_NULL, new Object[]{packageFilename}));
+ throw new RuntimeException("Missing serialized package: " + packageFilename);
}
URI uri = URI.createURI(url.toString());
Resource resource = new EcoreResourceFactoryImpl().createResource(uri);
diff --git a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/carnot.ecore b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/carnot.ecore
index 5bf6570..77fe0dd 100644
--- a/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/carnot.ecore
+++ b/model/org.eclipse.stardust.model.xpdl/src/org/eclipse/stardust/model/xpdl/carnot/impl/carnot.ecore
@@ -674,6 +674,7 @@
<details key="name" value="abstractEventSymbol_._type"/>
<details key="kind" value="empty"/>
</eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2003/XMLType#//String"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="AccessPointType" eSuperTypes="#//IIdentifiableModelElement #//ITypedElement">
<eAnnotations source="http:///org/eclipse/emf/ecore/util/ExtendedMetaData">