aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorskovalsky2012-03-18 18:35:11 (EDT)
committermgolubev2012-03-18 18:35:11 (EDT)
commit8e9a1ba56437aa6202353395ed73e7aeb2aabba8 (patch)
tree627f69053e132ee8270be41249e7719e52b24297
parentd3a6e7b1a689df8b00452bc4905ab271941d1884 (diff)
downloadorg.eclipse.gmf-tooling-8e9a1ba56437aa6202353395ed73e7aeb2aabba8.zip
org.eclipse.gmf-tooling-8e9a1ba56437aa6202353395ed73e7aeb2aabba8.tar.gz
org.eclipse.gmf-tooling-8e9a1ba56437aa6202353395ed73e7aeb2aabba8.tar.bz2
[374583] - Generic OCL-configurable choice parser: gen model + edit
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/plugin.properties4
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GMFGenItemProviderAdapterFactory.java24
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenParsersItemProvider.java5
-rw-r--r--plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/OclChoiceParserItemProvider.java178
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore5
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.emf7
-rw-r--r--plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel5
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenFactory.java9
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java125
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/OclChoiceParser.java97
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java11
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java43
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/OclChoiceParserImpl.java236
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/PredefinedEnumParserImpl.java8
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenAdapterFactory.java18
-rw-r--r--plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java22
16 files changed, 770 insertions, 27 deletions
diff --git a/plugins/org.eclipse.gmf.codegen.edit/plugin.properties b/plugins/org.eclipse.gmf.codegen.edit/plugin.properties
index 5c64a2b..5da5fcd 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/plugin.properties
+++ b/plugins/org.eclipse.gmf.codegen.edit/plugin.properties
@@ -930,3 +930,7 @@ _UI_ExpressionLabelParser_viewExpression_feature = View Expression
_UI_ExpressionLabelParser_editExpression_feature = Edit Expression
_UI_ExpressionLabelParser_validateExpression_feature = Validate Expression
_UI_PredefinedEnumParser_type = Predefined Enum Parser
+_UI_OclChoiceParser_type = Ocl Choice Parser
+_UI_OclChoiceParser_itemsExpression_feature = Items Expression
+_UI_OclChoiceParser_showExpression_feature = Show Expression
+_UI_OclChoiceParser_expressionContext_feature = Expression Context
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GMFGenItemProviderAdapterFactory.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GMFGenItemProviderAdapterFactory.java
index 1961960..91d9df3 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GMFGenItemProviderAdapterFactory.java
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GMFGenItemProviderAdapterFactory.java
@@ -2274,6 +2274,29 @@ public class GMFGenItemProviderAdapterFactory extends GMFGenAdapterFactory imple
}
/**
+ * This keeps track of the one adapter used for all {@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser} instances.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected OclChoiceParserItemProvider oclChoiceParserItemProvider;
+
+ /**
+ * This creates an adapter for a {@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Adapter createOclChoiceParserAdapter() {
+ if (oclChoiceParserItemProvider == null) {
+ oclChoiceParserItemProvider = new OclChoiceParserItemProvider(this);
+ }
+
+ return oclChoiceParserItemProvider;
+ }
+
+ /**
* This keeps track of the one adapter used for all {@link org.eclipse.gmf.codegen.gmfgen.ExpressionLabelParser} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -2611,6 +2634,7 @@ public class GMFGenItemProviderAdapterFactory extends GMFGenAdapterFactory imple
if (genParsersItemProvider != null) genParsersItemProvider.dispose();
if (predefinedParserItemProvider != null) predefinedParserItemProvider.dispose();
if (predefinedEnumParserItemProvider != null) predefinedEnumParserItemProvider.dispose();
+ if (oclChoiceParserItemProvider != null) oclChoiceParserItemProvider.dispose();
if (expressionLabelParserItemProvider != null) expressionLabelParserItemProvider.dispose();
if (customParserItemProvider != null) customParserItemProvider.dispose();
if (externalParserItemProvider != null) externalParserItemProvider.dispose();
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenParsersItemProvider.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenParsersItemProvider.java
index 10cf678..fba82f6 100644
--- a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenParsersItemProvider.java
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/GenParsersItemProvider.java
@@ -302,6 +302,11 @@ public class GenParsersItemProvider
newChildDescriptors.add
(createChildParameter
(GMFGenPackage.eINSTANCE.getGenParsers_Implementations(),
+ GMFGenFactory.eINSTANCE.createOclChoiceParser()));
+
+ newChildDescriptors.add
+ (createChildParameter
+ (GMFGenPackage.eINSTANCE.getGenParsers_Implementations(),
GMFGenFactory.eINSTANCE.createExpressionLabelParser()));
newChildDescriptors.add
diff --git a/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/OclChoiceParserItemProvider.java b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/OclChoiceParserItemProvider.java
new file mode 100644
index 0000000..980ee03
--- /dev/null
+++ b/plugins/org.eclipse.gmf.codegen.edit/src/org/eclipse/gmf/codegen/gmfgen/provider/OclChoiceParserItemProvider.java
@@ -0,0 +1,178 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.codegen.gmfgen.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
+import org.eclipse.gmf.codegen.gmfgen.OclChoiceParser;
+
+/**
+ * This is the item provider adapter for a {@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class OclChoiceParserItemProvider
+ extends GenParserImplementationItemProvider
+ implements
+ IEditingDomainItemProvider,
+ IStructuredItemContentProvider,
+ ITreeItemContentProvider,
+ IItemLabelProvider,
+ IItemPropertySource {
+ /**
+ * This constructs an instance from a factory and a notifier.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public OclChoiceParserItemProvider(AdapterFactory adapterFactory) {
+ super(adapterFactory);
+ }
+
+ /**
+ * This returns the property descriptors for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+ if (itemPropertyDescriptors == null) {
+ super.getPropertyDescriptors(object);
+
+ addItemsExpressionPropertyDescriptor(object);
+ addShowExpressionPropertyDescriptor(object);
+ }
+ return itemPropertyDescriptors;
+ }
+
+ /**
+ * This adds a property descriptor for the Items Expression feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addItemsExpressionPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_OclChoiceParser_itemsExpression_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_OclChoiceParser_itemsExpression_feature", "_UI_OclChoiceParser_type"),
+ GMFGenPackage.eINSTANCE.getOclChoiceParser_ItemsExpression(),
+ true,
+ false,
+ false,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Show Expression feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addShowExpressionPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_OclChoiceParser_showExpression_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_OclChoiceParser_showExpression_feature", "_UI_OclChoiceParser_type"),
+ GMFGenPackage.eINSTANCE.getOclChoiceParser_ShowExpression(),
+ true,
+ false,
+ false,
+ null,
+ null,
+ null));
+ }
+
+ /**
+ * This returns OclChoiceParser.gif.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object getImage(Object object) {
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/OclChoiceParser"));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected boolean shouldComposeCreationImage() {
+ return true;
+ }
+
+ /**
+ * This returns the label text for the adapted class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public String getText(Object object) {
+ return getString("_UI_OclChoiceParser_type");
+ }
+
+ /**
+ * This handles model notifications by calling {@link #updateChildren} to update any cached
+ * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void notifyChanged(Notification notification) {
+ updateChildren(notification);
+
+ switch (notification.getFeatureID(OclChoiceParser.class)) {
+ case GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION:
+ case GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION:
+ fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+ return;
+ }
+ super.notifyChanged(notification);
+ }
+
+ /**
+ * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+ * that can be created under this object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+ super.collectNewChildDescriptors(newChildDescriptors, object);
+ }
+
+}
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
index e44f612..4c19d17 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.ecore
@@ -2301,6 +2301,11 @@
<eClassifiers xsi:type="ecore:EClass" name="PredefinedEnumParser" eSuperTypes="#//GenParserImplementation">
<eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="OclChoiceParser" eSuperTypes="#//GenParserImplementation">
+ <eOperations name="getQualifiedClassName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="itemsExpression" eType="#//ValueExpression"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="showExpression" eType="#//ValueExpression"/>
+ </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="ExpressionLabelParser" eSuperTypes="#//GenParserImplementation">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value="Parser implementation that uses expressions to produce string values"/>
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf b/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf
index 3da1bcb..a67df86 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.emf
@@ -1600,6 +1600,13 @@ class PredefinedEnumParser extends GenParserImplementation {
op String getQualifiedClassName();
}
+class OclChoiceParser extends GenParserImplementation {
+ op String getQualifiedClassName();
+
+ ref ValueExpression[?] itemsExpression;
+ ref ValueExpression[?] showExpression;
+}
+
@genmodel(documentation="Parser implementation that uses expressions to produce string values")
class ExpressionLabelParser extends GenParserImplementation {
@genmodel(documentation="Provides means to alter name of parser implementation class")
diff --git a/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel b/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
index 0769bc4..78f436e 100644
--- a/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
+++ b/plugins/org.eclipse.gmf.codegen/models/gmfgen.genmodel
@@ -1036,6 +1036,11 @@
<genClasses ecoreClass="gmfgen.ecore#//PredefinedEnumParser">
<genOperations ecoreOperation="gmfgen.ecore#//PredefinedEnumParser/getQualifiedClassName"/>
</genClasses>
+ <genClasses ecoreClass="gmfgen.ecore#//OclChoiceParser">
+ <genFeatures createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//OclChoiceParser/itemsExpression"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EReference gmfgen.ecore#//OclChoiceParser/showExpression"/>
+ <genOperations ecoreOperation="gmfgen.ecore#//OclChoiceParser/getQualifiedClassName"/>
+ </genClasses>
<genClasses ecoreClass="gmfgen.ecore#//ExpressionLabelParser">
<genFeatures createChild="false" ecoreFeature="ecore:EAttribute gmfgen.ecore#//ExpressionLabelParser/className"/>
<genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference gmfgen.ecore#//ExpressionLabelParser/expressionContext"/>
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenFactory.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenFactory.java
index 14cfce3..0d847d8 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenFactory.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenFactory.java
@@ -881,6 +881,15 @@ public interface GMFGenFactory extends EFactory {
PredefinedEnumParser createPredefinedEnumParser();
/**
+ * Returns a new object of class '<em>Ocl Choice Parser</em>'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return a new object of class '<em>Ocl Choice Parser</em>'.
+ * @generated
+ */
+ OclChoiceParser createOclChoiceParser();
+
+ /**
* Returns a new object of class '<em>Expression Label Parser</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
index 44eb890..a205c85 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/GMFGenPackage.java
@@ -10793,6 +10793,61 @@ public interface GMFGenPackage extends EPackage {
int PREDEFINED_ENUM_PARSER_FEATURE_COUNT = GEN_PARSER_IMPLEMENTATION_FEATURE_COUNT + 0;
/**
+ * The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.OclChoiceParserImpl <em>Ocl Choice Parser</em>}' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see org.eclipse.gmf.codegen.gmfgen.impl.OclChoiceParserImpl
+ * @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getOclChoiceParser()
+ * @generated
+ */
+ int OCL_CHOICE_PARSER = 137;
+
+ /**
+ * The feature id for the '<em><b>Holder</b></em>' container reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int OCL_CHOICE_PARSER__HOLDER = GEN_PARSER_IMPLEMENTATION__HOLDER;
+
+ /**
+ * The feature id for the '<em><b>Uses</b></em>' reference list.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int OCL_CHOICE_PARSER__USES = GEN_PARSER_IMPLEMENTATION__USES;
+
+ /**
+ * The feature id for the '<em><b>Items Expression</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int OCL_CHOICE_PARSER__ITEMS_EXPRESSION = GEN_PARSER_IMPLEMENTATION_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Show Expression</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int OCL_CHOICE_PARSER__SHOW_EXPRESSION = GEN_PARSER_IMPLEMENTATION_FEATURE_COUNT + 1;
+
+ /**
+ * The number of structural features of the '<em>Ocl Choice Parser</em>' class.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int OCL_CHOICE_PARSER_FEATURE_COUNT = GEN_PARSER_IMPLEMENTATION_FEATURE_COUNT + 2;
+
+ /**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.impl.ExpressionLabelParserImpl <em>Expression Label Parser</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -10800,7 +10855,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getExpressionLabelParser()
* @generated
*/
- int EXPRESSION_LABEL_PARSER = 137;
+ int EXPRESSION_LABEL_PARSER = 138;
/**
* The feature id for the '<em><b>Holder</b></em>' container reference.
@@ -10882,7 +10937,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getCustomParser()
* @generated
*/
- int CUSTOM_PARSER = 138;
+ int CUSTOM_PARSER = 139;
/**
* The feature id for the '<em><b>Holder</b></em>' container reference.
@@ -10937,7 +10992,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getExternalParser()
* @generated
*/
- int EXTERNAL_PARSER = 139;
+ int EXTERNAL_PARSER = 140;
/**
* The feature id for the '<em><b>Holder</b></em>' container reference.
@@ -10983,7 +11038,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getStandardPreferencePages()
* @generated
*/
- int STANDARD_PREFERENCE_PAGES = 140;
+ int STANDARD_PREFERENCE_PAGES = 141;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.RulerUnits <em>Ruler Units</em>}' enum.
@@ -10993,7 +11048,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getRulerUnits()
* @generated
*/
- int RULER_UNITS = 141;
+ int RULER_UNITS = 142;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.Routing <em>Routing</em>}' enum.
@@ -11003,7 +11058,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getRouting()
* @generated
*/
- int ROUTING = 142;
+ int ROUTING = 143;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LineStyle <em>Line Style</em>}' enum.
@@ -11013,7 +11068,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLineStyle()
* @generated
*/
- int LINE_STYLE = 143;
+ int LINE_STYLE = 144;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.JFaceFont <em>JFace Font</em>}' enum.
@@ -11023,7 +11078,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getJFaceFont()
* @generated
*/
- int JFACE_FONT = 144;
+ int JFACE_FONT = 145;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.FontStyle <em>Font Style</em>}' enum.
@@ -11033,7 +11088,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getFontStyle()
* @generated
*/
- int FONT_STYLE = 145;
+ int FONT_STYLE = 146;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.DiagramColors <em>Diagram Colors</em>}' enum.
@@ -11043,7 +11098,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getDiagramColors()
* @generated
*/
- int DIAGRAM_COLORS = 146;
+ int DIAGRAM_COLORS = 147;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.ProviderPriority <em>Provider Priority</em>}' enum.
@@ -11053,7 +11108,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getProviderPriority()
* @generated
*/
- int PROVIDER_PRIORITY = 147;
+ int PROVIDER_PRIORITY = 148;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LinkLabelAlignment <em>Link Label Alignment</em>}' enum.
@@ -11063,7 +11118,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLinkLabelAlignment()
* @generated
*/
- int LINK_LABEL_ALIGNMENT = 148;
+ int LINK_LABEL_ALIGNMENT = 149;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.LabelTextAccessMethod <em>Label Text Access Method</em>}' enum.
@@ -11073,7 +11128,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getLabelTextAccessMethod()
* @generated
*/
- int LABEL_TEXT_ACCESS_METHOD = 149;
+ int LABEL_TEXT_ACCESS_METHOD = 150;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.ViewmapLayoutType <em>Viewmap Layout Type</em>}' enum.
@@ -11083,7 +11138,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getViewmapLayoutType()
* @generated
*/
- int VIEWMAP_LAYOUT_TYPE = 150;
+ int VIEWMAP_LAYOUT_TYPE = 151;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.StandardEntryKind <em>Standard Entry Kind</em>}' enum.
@@ -11093,7 +11148,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getStandardEntryKind()
* @generated
*/
- int STANDARD_ENTRY_KIND = 151;
+ int STANDARD_ENTRY_KIND = 152;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenSeverity <em>Gen Severity</em>}' enum.
@@ -11103,7 +11158,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenSeverity()
* @generated
*/
- int GEN_SEVERITY = 152;
+ int GEN_SEVERITY = 153;
/**
* The meta object id for the '{@link org.eclipse.gmf.codegen.gmfgen.GenLanguage <em>Gen Language</em>}' enum.
@@ -11113,7 +11168,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenLanguage()
* @generated
*/
- int GEN_LANGUAGE = 153;
+ int GEN_LANGUAGE = 154;
/**
@@ -11124,7 +11179,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGenNavigatorReferenceType()
* @generated
*/
- int GEN_NAVIGATOR_REFERENCE_TYPE = 154;
+ int GEN_NAVIGATOR_REFERENCE_TYPE = 155;
/**
@@ -11135,7 +11190,7 @@ public interface GMFGenPackage extends EPackage {
* @see org.eclipse.gmf.codegen.gmfgen.impl.GMFGenPackageImpl#getGeneratedType()
* @generated
*/
- int GENERATED_TYPE = 155;
+ int GENERATED_TYPE = 156;
/**
@@ -17591,6 +17646,38 @@ public interface GMFGenPackage extends EPackage {
EClass getPredefinedEnumParser();
/**
+ * Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser <em>Ocl Choice Parser</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for class '<em>Ocl Choice Parser</em>'.
+ * @see org.eclipse.gmf.codegen.gmfgen.OclChoiceParser
+ * @generated
+ */
+ EClass getOclChoiceParser();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getItemsExpression <em>Items Expression</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Items Expression</em>'.
+ * @see org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getItemsExpression()
+ * @see #getOclChoiceParser()
+ * @generated
+ */
+ EReference getOclChoiceParser_ItemsExpression();
+
+ /**
+ * Returns the meta object for the reference '{@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getShowExpression <em>Show Expression</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the reference '<em>Show Expression</em>'.
+ * @see org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getShowExpression()
+ * @see #getOclChoiceParser()
+ * @generated
+ */
+ EReference getOclChoiceParser_ShowExpression();
+
+ /**
* Returns the meta object for class '{@link org.eclipse.gmf.codegen.gmfgen.ExpressionLabelParser <em>Expression Label Parser</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/OclChoiceParser.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/OclChoiceParser.java
new file mode 100644
index 0000000..35cfbe5
--- /dev/null
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/OclChoiceParser.java
@@ -0,0 +1,97 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.codegen.gmfgen;
+
+/**
+ * <!-- begin-user-doc --> A representation of the model object '
+ * <em><b>Ocl Choice Parser</b></em>'. <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getItemsExpression
+ * <em>Items Expression</em>}</li>
+ * <li>{@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getShowExpression
+ * <em>Show Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getOclChoiceParser()
+ * @model
+ * @generated
+ */
+public interface OclChoiceParser extends GenParserImplementation {
+
+ /**
+ * Returns the value of the '<em><b>Items Expression</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Items Expression</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Items Expression</em>' reference.
+ * @see #setItemsExpression(ValueExpression)
+ * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getOclChoiceParser_ItemsExpression()
+ * @model
+ * @generated
+ */
+ ValueExpression getItemsExpression();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getItemsExpression
+ * <em>Items Expression</em>}' reference. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Items Expression</em>' reference.
+ * @see #getItemsExpression()
+ * @generated
+ */
+ void setItemsExpression(ValueExpression value);
+
+ /**
+ * Returns the value of the '<em><b>Show Expression</b></em>' reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Show Expression</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ *
+ * @return the value of the '<em>Show Expression</em>' reference.
+ * @see #setShowExpression(ValueExpression)
+ * @see org.eclipse.gmf.codegen.gmfgen.GMFGenPackage#getOclChoiceParser_ShowExpression()
+ * @model
+ * @generated
+ */
+ ValueExpression getShowExpression();
+
+ /**
+ * Sets the value of the '
+ * {@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser#getShowExpression
+ * <em>Show Expression</em>}' reference. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @param value
+ * the new value of the '<em>Show Expression</em>' reference.
+ * @see #getShowExpression()
+ * @generated
+ */
+ void setShowExpression(ValueExpression value);
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @model kind="operation"
+ * @generated
+ */
+ String getQualifiedClassName();
+
+} // OclChoiceParser
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
index fd2f1f8..25234ac 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenFactoryImpl.java
@@ -157,6 +157,7 @@ public class GMFGenFactoryImpl extends EFactoryImpl implements GMFGenFactory {
case GMFGenPackage.GEN_PARSERS: return createGenParsers();
case GMFGenPackage.PREDEFINED_PARSER: return createPredefinedParser();
case GMFGenPackage.PREDEFINED_ENUM_PARSER: return createPredefinedEnumParser();
+ case GMFGenPackage.OCL_CHOICE_PARSER: return createOclChoiceParser();
case GMFGenPackage.EXPRESSION_LABEL_PARSER: return createExpressionLabelParser();
case GMFGenPackage.CUSTOM_PARSER: return createCustomParser();
case GMFGenPackage.EXTERNAL_PARSER: return createExternalParser();
@@ -1230,6 +1231,16 @@ public class GMFGenFactoryImpl extends EFactoryImpl implements GMFGenFactory {
* <!-- end-user-doc -->
* @generated
*/
+ public OclChoiceParser createOclChoiceParser() {
+ OclChoiceParserImpl oclChoiceParser = new OclChoiceParserImpl();
+ return oclChoiceParser;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public ExpressionLabelParser createExpressionLabelParser() {
ExpressionLabelParserImpl expressionLabelParser = new ExpressionLabelParserImpl();
return expressionLabelParser;
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
index 7f3089f..ce777bd 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/GMFGenPackageImpl.java
@@ -1010,6 +1010,13 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
* <!-- end-user-doc -->
* @generated
*/
+ private EClass oclChoiceParserEClass = null;
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
private EClass expressionLabelParserEClass = null;
/**
@@ -7055,9 +7062,39 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
* <!-- end-user-doc -->
* @generated
*/
+ public EClass getOclChoiceParser() {
+ if (oclChoiceParserEClass == null) {
+ oclChoiceParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(153);
+ }
+ return oclChoiceParserEClass;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getOclChoiceParser_ItemsExpression() {
+ return (EReference)getOclChoiceParser().getEStructuralFeatures().get(0);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EReference getOclChoiceParser_ShowExpression() {
+ return (EReference)getOclChoiceParser().getEStructuralFeatures().get(1);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
public EClass getExpressionLabelParser() {
if (expressionLabelParserEClass == null) {
- expressionLabelParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(153);
+ expressionLabelParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(154);
}
return expressionLabelParserEClass;
}
@@ -7114,7 +7151,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
*/
public EClass getCustomParser() {
if (customParserEClass == null) {
- customParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(154);
+ customParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(155);
}
return customParserEClass;
}
@@ -7144,7 +7181,7 @@ public class GMFGenPackageImpl extends EPackageImpl implements GMFGenPackage {
*/
public EClass getExternalParser() {
if (externalParserEClass == null) {
- externalParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(155);
+ externalParserEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(GMFGenPackage.eNS_URI).getEClassifiers().get(156);
}
return externalParserEClass;
}
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/OclChoiceParserImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/OclChoiceParserImpl.java
new file mode 100644
index 0000000..411cc7d
--- /dev/null
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/OclChoiceParserImpl.java
@@ -0,0 +1,236 @@
+/**
+ * <copyright>
+ * </copyright>
+ *
+ * $Id$
+ */
+package org.eclipse.gmf.codegen.gmfgen.impl;
+
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
+import org.eclipse.gmf.codegen.gmfgen.GMFGenPackage;
+import org.eclipse.gmf.codegen.gmfgen.OclChoiceParser;
+import org.eclipse.gmf.codegen.gmfgen.ValueExpression;
+
+/**
+ * <!-- begin-user-doc --> An implementation of the model object '
+ * <em><b>Ocl Choice Parser</b></em>'. <!-- end-user-doc -->
+ * <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>
+ * {@link org.eclipse.gmf.codegen.gmfgen.impl.OclChoiceParserImpl#getItemsExpression
+ * <em>Items Expression</em>}</li>
+ * <li>
+ * {@link org.eclipse.gmf.codegen.gmfgen.impl.OclChoiceParserImpl#getShowExpression
+ * <em>Show Expression</em>}</li>
+ * </ul>
+ * </p>
+ *
+ * @generated
+ */
+public class OclChoiceParserImpl extends GenParserImplementationImpl implements OclChoiceParser {
+
+ /**
+ * The cached value of the '{@link #getItemsExpression()
+ * <em>Items Expression</em>}' reference. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @see #getItemsExpression()
+ * @generated
+ * @ordered
+ */
+ protected ValueExpression itemsExpression;
+
+ /**
+ * The cached value of the '{@link #getShowExpression()
+ * <em>Show Expression</em>}' reference. <!-- begin-user-doc --> <!--
+ * end-user-doc -->
+ *
+ * @see #getShowExpression()
+ * @generated
+ * @ordered
+ */
+ protected ValueExpression showExpression;
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ protected OclChoiceParserImpl() {
+ super();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ protected EClass eStaticClass() {
+ return GMFGenPackage.eINSTANCE.getOclChoiceParser();
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public ValueExpression getItemsExpression() {
+ if (itemsExpression != null && itemsExpression.eIsProxy()) {
+ InternalEObject oldItemsExpression = (InternalEObject) itemsExpression;
+ itemsExpression = (ValueExpression) eResolveProxy(oldItemsExpression);
+ if (itemsExpression != oldItemsExpression) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION, oldItemsExpression, itemsExpression));
+ }
+ }
+ return itemsExpression;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public ValueExpression basicGetItemsExpression() {
+ return itemsExpression;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setItemsExpression(ValueExpression newItemsExpression) {
+ ValueExpression oldItemsExpression = itemsExpression;
+ itemsExpression = newItemsExpression;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION, oldItemsExpression, itemsExpression));
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public ValueExpression getShowExpression() {
+ if (showExpression != null && showExpression.eIsProxy()) {
+ InternalEObject oldShowExpression = (InternalEObject) showExpression;
+ showExpression = (ValueExpression) eResolveProxy(oldShowExpression);
+ if (showExpression != oldShowExpression) {
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.RESOLVE, GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION, oldShowExpression, showExpression));
+ }
+ }
+ return showExpression;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public ValueExpression basicGetShowExpression() {
+ return showExpression;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ public void setShowExpression(ValueExpression newShowExpression) {
+ ValueExpression oldShowExpression = showExpression;
+ showExpression = newShowExpression;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION, oldShowExpression, showExpression));
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated NOT
+ */
+ public String getQualifiedClassName() {
+ final String className = getShowExpression() == null ? "OCLChoiceParser" : "OCLTrackerChoiceParser";
+ final String packageName = "org.eclipse.gmf.tooling.runtime.parsers";
+ return packageName + '.' + className;
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION:
+ if (resolve)
+ return getItemsExpression();
+ return basicGetItemsExpression();
+ case GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION:
+ if (resolve)
+ return getShowExpression();
+ return basicGetShowExpression();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION:
+ setItemsExpression((ValueExpression) newValue);
+ return;
+ case GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION:
+ setShowExpression((ValueExpression) newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION:
+ setItemsExpression((ValueExpression) null);
+ return;
+ case GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION:
+ setShowExpression((ValueExpression) null);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc --> <!-- end-user-doc -->
+ *
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION:
+ return itemsExpression != null;
+ case GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION:
+ return showExpression != null;
+ }
+ return super.eIsSet(featureID);
+ }
+
+} //OclChoiceParserImpl
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/PredefinedEnumParserImpl.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/PredefinedEnumParserImpl.java
index ba8036d..53193bd 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/PredefinedEnumParserImpl.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/impl/PredefinedEnumParserImpl.java
@@ -46,11 +46,9 @@ public class PredefinedEnumParserImpl extends GenParserImplementationImpl implem
* @generated NOT
*/
public String getQualifiedClassName() {
- String n = "EnumParser";
- if (getHolder() == null || GenCommonBaseImpl.isEmpty(getHolder().getImplPackageName())) {
- return n;
- }
- return getHolder().getImplPackageName() + '.' + n;
+ final String className = "EnumParser";
+ final String packageName = "org.eclipse.gmf.tooling.runtime.parsers";
+ return packageName + '.' + className;
}
} //PredefinedEnumParserImpl
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenAdapterFactory.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenAdapterFactory.java
index 1d51c45..8fc4b35 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenAdapterFactory.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenAdapterFactory.java
@@ -617,6 +617,10 @@ public class GMFGenAdapterFactory extends AdapterFactoryImpl {
return createPredefinedEnumParserAdapter();
}
@Override
+ public Adapter caseOclChoiceParser(OclChoiceParser object) {
+ return createOclChoiceParserAdapter();
+ }
+ @Override
public Adapter caseExpressionLabelParser(ExpressionLabelParser object) {
return createExpressionLabelParserAdapter();
}
@@ -2525,6 +2529,20 @@ public class GMFGenAdapterFactory extends AdapterFactoryImpl {
}
/**
+ * Creates a new adapter for an object of class '{@link org.eclipse.gmf.codegen.gmfgen.OclChoiceParser <em>Ocl Choice Parser</em>}'.
+ * <!-- begin-user-doc -->
+ * This default implementation returns null so that we can easily ignore cases;
+ * it's useful to ignore a case when inheritance will catch all the cases anyway.
+ * <!-- end-user-doc -->
+ * @return the new adapter.
+ * @see org.eclipse.gmf.codegen.gmfgen.OclChoiceParser
+ * @generated
+ */
+ public Adapter createOclChoiceParserAdapter() {
+ return null;
+ }
+
+ /**
* Creates a new adapter for an object of class '{@link org.eclipse.gmf.codegen.gmfgen.ExpressionLabelParser <em>Expression Label Parser</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java
index b7b1011..e0eb65b 100644
--- a/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java
+++ b/plugins/org.eclipse.gmf.codegen/src/org/eclipse/gmf/codegen/gmfgen/util/GMFGenSwitch.java
@@ -1042,6 +1042,13 @@ public class GMFGenSwitch<T> extends Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
+ case GMFGenPackage.OCL_CHOICE_PARSER: {
+ OclChoiceParser oclChoiceParser = (OclChoiceParser)theEObject;
+ T result = caseOclChoiceParser(oclChoiceParser);
+ if (result == null) result = caseGenParserImplementation(oclChoiceParser);
+ if (result == null) result = defaultCase(theEObject);
+ return result;
+ }
case GMFGenPackage.EXPRESSION_LABEL_PARSER: {
ExpressionLabelParser expressionLabelParser = (ExpressionLabelParser)theEObject;
T result = caseExpressionLabelParser(expressionLabelParser);
@@ -3078,6 +3085,21 @@ public class GMFGenSwitch<T> extends Switch<T> {
}
/**
+ * Returns the result of interpreting the object as an instance of '<em>Ocl Choice Parser</em>'.
+ * <!-- begin-user-doc -->
+ * This implementation returns null;
+ * returning a non-null result will terminate the switch.
+ * <!-- end-user-doc -->
+ * @param object the target of the switch.
+ * @return the result of interpreting the object as an instance of '<em>Ocl Choice Parser</em>'.
+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
+ * @generated
+ */
+ public T caseOclChoiceParser(OclChoiceParser object) {
+ return null;
+ }
+
+ /**
* Returns the result of interpreting the object as an instance of '<em>Expression Label Parser</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;