[374583] - FQN of choice parser(s) corrected according to real class FQN
in GMFT-R plugin
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
index 35cfbe5..5e914bb 100644
--- 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
@@ -9,17 +9,15 @@
/**
* <!-- 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>
+ * <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
@@ -34,7 +32,6 @@
* 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()
@@ -44,13 +41,10 @@
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.
+ * 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
*/
@@ -64,7 +58,6 @@
* 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()
@@ -74,21 +67,18 @@
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.
+ * 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 -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @model kind="operation"
* @generated
*/
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
index 411cc7d..e5770be 100644
--- 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
@@ -7,37 +7,35 @@
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 -->
+ * <!-- 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>
+ * <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 -->
- *
+ * The cached value of the '{@link #getItemsExpression() <em>Items Expression</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #getItemsExpression()
* @generated
* @ordered
@@ -45,10 +43,9 @@
protected ValueExpression itemsExpression;
/**
- * The cached value of the '{@link #getShowExpression()
- * <em>Show Expression</em>}' reference. <!-- begin-user-doc --> <!--
- * end-user-doc -->
- *
+ * The cached value of the '{@link #getShowExpression() <em>Show Expression</em>}' reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @see #getShowExpression()
* @generated
* @ordered
@@ -56,8 +53,8 @@
protected ValueExpression showExpression;
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
protected OclChoiceParserImpl() {
@@ -65,8 +62,8 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
@Override
@@ -75,14 +72,14 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public ValueExpression getItemsExpression() {
if (itemsExpression != null && itemsExpression.eIsProxy()) {
- InternalEObject oldItemsExpression = (InternalEObject) itemsExpression;
- itemsExpression = (ValueExpression) eResolveProxy(oldItemsExpression);
+ 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));
@@ -92,8 +89,8 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public ValueExpression basicGetItemsExpression() {
@@ -101,8 +98,8 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public void setItemsExpression(ValueExpression newItemsExpression) {
@@ -113,14 +110,14 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public ValueExpression getShowExpression() {
if (showExpression != null && showExpression.eIsProxy()) {
- InternalEObject oldShowExpression = (InternalEObject) showExpression;
- showExpression = (ValueExpression) eResolveProxy(oldShowExpression);
+ 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));
@@ -130,8 +127,8 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public ValueExpression basicGetShowExpression() {
@@ -139,8 +136,8 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
* @generated
*/
public void setShowExpression(ValueExpression newShowExpression) {
@@ -151,84 +148,84 @@
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- begin-user-doc -->
+ * This method returns the FQN of one of the existing classes, in particular,
+ * either 'org.eclipse.gmf.tooling.runtime.parsers.OclChoiceParser' or 'org.eclipse.gmf.tooling.runtime.parsers.OclTrackerChoiceParser'
+ * <!-- end-user-doc -->
* @generated NOT
*/
public String getQualifiedClassName() {
- final String className = getShowExpression() == null ? "OCLChoiceParser" : "OCLTrackerChoiceParser";
- final String packageName = "org.eclipse.gmf.tooling.runtime.parsers";
+ final String packageName = "org.eclipse.gmf.tooling.runtime.parsers"; //$NON-NLS-1$
+ final String className = getShowExpression() == null ? "OclChoiceParser" : "OclTrackerChoiceParser"; //$NON-NLS-1$ //$NON-NLS-2$
return packageName + '.' + className;
}
/**
- * <!-- begin-user-doc --> <!-- end-user-doc -->
- *
+ * <!-- 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();
+ 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 -->
- *
+ * <!-- 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;
+ 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 -->
- *
+ * <!-- 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;
+ 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 -->
- *
+ * <!-- 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;
+ case GMFGenPackage.OCL_CHOICE_PARSER__ITEMS_EXPRESSION:
+ return itemsExpression != null;
+ case GMFGenPackage.OCL_CHOICE_PARSER__SHOW_EXPRESSION:
+ return showExpression != null;
}
return super.eIsSet(featureID);
}
