summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsefftinge2008-03-04 04:20:37 (EST)
committersefftinge2008-03-04 04:20:37 (EST)
commit5eb7284d48d11bb33ef635028466e4a7e362f780 (patch)
tree77a471fd0a8e4fc0579497252406a4c05230e7e8
parentd595f70b90f02b61032b55ffc759c890ee881735 (diff)
downloadorg.eclipse.xpand-5eb7284d48d11bb33ef635028466e4a7e362f780.zip
org.eclipse.xpand-5eb7284d48d11bb33ef635028466e4a7e362f780.tar.gz
org.eclipse.xpand-5eb7284d48d11bb33ef635028466e4a7e362f780.tar.bz2
*** empty log message ***
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java63
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java17
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java188
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java154
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java203
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java166
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java21
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java62
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java38
-rw-r--r--plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java48
-rw-r--r--plugins/org.eclipse.xpand3/src/xpand3.ecore9
11 files changed, 305 insertions, 664 deletions
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java
index fa8d23b..ce7de0b 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Identifier.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Identifier.java,v 1.1 2008/02/27 13:21:08 sefftinge Exp $
+ * $Id: Identifier.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3;
@@ -12,10 +12,69 @@ package org.eclipse.xpand3;
* A representation of the model object '<em><b>Identifier</b></em>'.
* <!-- end-user-doc -->
*
+ * <p>
+ * The following features are supported:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.Identifier#getNext <em>Next</em>}</li>
+ * <li>{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}</li>
+ * </ul>
+ * </p>
*
* @see org.eclipse.xpand3.Xpand3Package#getIdentifier()
- * @model abstract="true"
+ * @model
* @generated
*/
public interface Identifier extends SyntaxElement {
+
+ /**
+ * Returns the value of the '<em><b>Next</b></em>' containment reference.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Next</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>Next</em>' containment reference.
+ * @see #setNext(Identifier)
+ * @see org.eclipse.xpand3.Xpand3Package#getIdentifier_Next()
+ * @model containment="true"
+ * @generated
+ */
+ Identifier getNext();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.Identifier#getNext <em>Next</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Next</em>' containment reference.
+ * @see #getNext()
+ * @generated
+ */
+ void setNext(Identifier value);
+
+ /**
+ * Returns the value of the '<em><b>Value</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <p>
+ * If the meaning of the '<em>Value</em>' attribute isn't clear,
+ * there really should be more of a description here...
+ * </p>
+ * <!-- end-user-doc -->
+ * @return the value of the '<em>Value</em>' attribute.
+ * @see #setValue(String)
+ * @see org.eclipse.xpand3.Xpand3Package#getIdentifier_Value()
+ * @model
+ * @generated
+ */
+ String getValue();
+
+ /**
+ * Sets the value of the '{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Value</em>' attribute.
+ * @see #getValue()
+ * @generated
+ */
+ void setValue(String value);
} // Identifier
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
index 84856a6..cffab1d 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Factory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3Factory.java,v 1.1 2008/02/27 13:21:08 sefftinge Exp $
+ * $Id: Xpand3Factory.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3;
@@ -44,22 +44,13 @@ public interface Xpand3Factory extends EFactory {
ImportStatement createImportStatement();
/**
- * Returns a new object of class '<em>Simple Identifier</em>'.
+ * Returns a new object of class '<em>Identifier</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Simple Identifier</em>'.
+ * @return a new object of class '<em>Identifier</em>'.
* @generated
*/
- SimpleIdentifier createSimpleIdentifier();
-
- /**
- * Returns a new object of class '<em>Composed Identifier</em>'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return a new object of class '<em>Composed Identifier</em>'.
- * @generated
- */
- ComposedIdentifier createComposedIdentifier();
+ Identifier createIdentifier();
/**
* Returns a new object of class '<em>Declared Parameter</em>'.
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java
index e88a7ae..6455a7a 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/Xpand3Package.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3Package.java,v 1.1 2008/02/27 13:21:08 sefftinge Exp $
+ * $Id: Xpand3Package.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3;
@@ -307,59 +307,13 @@ public interface Xpand3Package extends EPackage {
int IDENTIFIER__FILE_NAME = SYNTAX_ELEMENT__FILE_NAME;
/**
- * The number of structural features of the '<em>Identifier</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int IDENTIFIER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
-
- /**
- * The meta object id for the '{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl <em>Simple Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.SimpleIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSimpleIdentifier()
- * @generated
- */
- int SIMPLE_IDENTIFIER = 4;
-
- /**
- * The feature id for the '<em><b>Line</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__LINE = IDENTIFIER__LINE;
-
- /**
- * The feature id for the '<em><b>Start</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__START = IDENTIFIER__START;
-
- /**
- * The feature id for the '<em><b>End</b></em>' attribute.
+ * The feature id for the '<em><b>Next</b></em>' containment reference.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int SIMPLE_IDENTIFIER__END = IDENTIFIER__END;
-
- /**
- * The feature id for the '<em><b>File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER__FILE_NAME = IDENTIFIER__FILE_NAME;
+ int IDENTIFIER__NEXT = SYNTAX_ELEMENT_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Value</b></em>' attribute.
@@ -368,80 +322,16 @@ public interface Xpand3Package extends EPackage {
* @generated
* @ordered
*/
- int SIMPLE_IDENTIFIER__VALUE = IDENTIFIER_FEATURE_COUNT + 0;
-
- /**
- * The number of structural features of the '<em>Simple Identifier</em>' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int SIMPLE_IDENTIFIER_FEATURE_COUNT = IDENTIFIER_FEATURE_COUNT + 1;
-
- /**
- * The meta object id for the '{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl <em>Composed Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.ComposedIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getComposedIdentifier()
- * @generated
- */
- int COMPOSED_IDENTIFIER = 5;
-
- /**
- * The feature id for the '<em><b>Line</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__LINE = IDENTIFIER__LINE;
-
- /**
- * The feature id for the '<em><b>Start</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__START = IDENTIFIER__START;
-
- /**
- * The feature id for the '<em><b>End</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__END = IDENTIFIER__END;
-
- /**
- * The feature id for the '<em><b>File Name</b></em>' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__FILE_NAME = IDENTIFIER__FILE_NAME;
-
- /**
- * The feature id for the '<em><b>Identifiers</b></em>' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- * @ordered
- */
- int COMPOSED_IDENTIFIER__IDENTIFIERS = IDENTIFIER_FEATURE_COUNT + 0;
+ int IDENTIFIER__VALUE = SYNTAX_ELEMENT_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Composed Identifier</em>' class.
+ * The number of structural features of the '<em>Identifier</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int COMPOSED_IDENTIFIER_FEATURE_COUNT = IDENTIFIER_FEATURE_COUNT + 1;
+ int IDENTIFIER_FEATURE_COUNT = SYNTAX_ELEMENT_FEATURE_COUNT + 2;
/**
* The meta object id for the '{@link org.eclipse.xpand3.impl.DeclaredParameterImpl <em>Declared Parameter</em>}' class.
@@ -451,7 +341,7 @@ public interface Xpand3Package extends EPackage {
* @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getDeclaredParameter()
* @generated
*/
- int DECLARED_PARAMETER = 6;
+ int DECLARED_PARAMETER = 4;
/**
* The feature id for the '<em><b>Line</b></em>' attribute.
@@ -646,46 +536,26 @@ public interface Xpand3Package extends EPackage {
EClass getIdentifier();
/**
- * Returns the meta object for class '{@link org.eclipse.xpand3.SimpleIdentifier <em>Simple Identifier</em>}'.
+ * Returns the meta object for the containment reference '{@link org.eclipse.xpand3.Identifier#getNext <em>Next</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Simple Identifier</em>'.
- * @see org.eclipse.xpand3.SimpleIdentifier
+ * @return the meta object for the containment reference '<em>Next</em>'.
+ * @see org.eclipse.xpand3.Identifier#getNext()
+ * @see #getIdentifier()
* @generated
*/
- EClass getSimpleIdentifier();
+ EReference getIdentifier_Next();
/**
- * Returns the meta object for the attribute '{@link org.eclipse.xpand3.SimpleIdentifier#getValue <em>Value</em>}'.
+ * Returns the meta object for the attribute '{@link org.eclipse.xpand3.Identifier#getValue <em>Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Value</em>'.
- * @see org.eclipse.xpand3.SimpleIdentifier#getValue()
- * @see #getSimpleIdentifier()
+ * @see org.eclipse.xpand3.Identifier#getValue()
+ * @see #getIdentifier()
* @generated
*/
- EAttribute getSimpleIdentifier_Value();
-
- /**
- * Returns the meta object for class '{@link org.eclipse.xpand3.ComposedIdentifier <em>Composed Identifier</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for class '<em>Composed Identifier</em>'.
- * @see org.eclipse.xpand3.ComposedIdentifier
- * @generated
- */
- EClass getComposedIdentifier();
-
- /**
- * Returns the meta object for the containment reference list '{@link org.eclipse.xpand3.ComposedIdentifier#getIdentifiers <em>Identifiers</em>}'.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the meta object for the containment reference list '<em>Identifiers</em>'.
- * @see org.eclipse.xpand3.ComposedIdentifier#getIdentifiers()
- * @see #getComposedIdentifier()
- * @generated
- */
- EReference getComposedIdentifier_Identifiers();
+ EAttribute getIdentifier_Value();
/**
* Returns the meta object for class '{@link org.eclipse.xpand3.DeclaredParameter <em>Declared Parameter</em>}'.
@@ -846,14 +716,12 @@ public interface Xpand3Package extends EPackage {
EClass IDENTIFIER = eINSTANCE.getIdentifier();
/**
- * The meta object literal for the '{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl <em>Simple Identifier</em>}' class.
+ * The meta object literal for the '<em><b>Next</b></em>' containment reference feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.SimpleIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getSimpleIdentifier()
* @generated
*/
- EClass SIMPLE_IDENTIFIER = eINSTANCE.getSimpleIdentifier();
+ EReference IDENTIFIER__NEXT = eINSTANCE.getIdentifier_Next();
/**
* The meta object literal for the '<em><b>Value</b></em>' attribute feature.
@@ -861,25 +729,7 @@ public interface Xpand3Package extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EAttribute SIMPLE_IDENTIFIER__VALUE = eINSTANCE.getSimpleIdentifier_Value();
-
- /**
- * The meta object literal for the '{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl <em>Composed Identifier</em>}' class.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see org.eclipse.xpand3.impl.ComposedIdentifierImpl
- * @see org.eclipse.xpand3.impl.Xpand3PackageImpl#getComposedIdentifier()
- * @generated
- */
- EClass COMPOSED_IDENTIFIER = eINSTANCE.getComposedIdentifier();
-
- /**
- * The meta object literal for the '<em><b>Identifiers</b></em>' containment reference list feature.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- EReference COMPOSED_IDENTIFIER__IDENTIFIERS = eINSTANCE.getComposedIdentifier_Identifiers();
+ EAttribute IDENTIFIER__VALUE = eINSTANCE.getIdentifier_Value();
/**
* The meta object literal for the '{@link org.eclipse.xpand3.impl.DeclaredParameterImpl <em>Declared Parameter</em>}' class.
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java
deleted file mode 100644
index 8968473..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/ComposedIdentifierImpl.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ComposedIdentifierImpl.java,v 1.1 2008/02/27 13:21:07 sefftinge Exp $
- */
-package org.eclipse.xpand3.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.xpand3.ComposedIdentifier;
-import org.eclipse.xpand3.Identifier;
-import org.eclipse.xpand3.Xpand3Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Composed Identifier</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.xpand3.impl.ComposedIdentifierImpl#getIdentifiers <em>Identifiers</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ComposedIdentifierImpl extends IdentifierImpl implements ComposedIdentifier {
- /**
- * The cached value of the '{@link #getIdentifiers() <em>Identifiers</em>}' containment reference list.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getIdentifiers()
- * @generated
- * @ordered
- */
- protected EList<Identifier> identifiers;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ComposedIdentifierImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return Xpand3Package.Literals.COMPOSED_IDENTIFIER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EList<Identifier> getIdentifiers() {
- if (identifiers == null) {
- identifiers = new EObjectContainmentEList<Identifier>(Identifier.class, this, Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS);
- }
- return identifiers;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- return ((InternalEList<?>)getIdentifiers()).basicRemove(otherEnd, msgs);
- }
- return super.eInverseRemove(otherEnd, featureID, msgs);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- return getIdentifiers();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @SuppressWarnings("unchecked")
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- getIdentifiers().clear();
- getIdentifiers().addAll((Collection<? extends Identifier>)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- getIdentifiers().clear();
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case Xpand3Package.COMPOSED_IDENTIFIER__IDENTIFIERS:
- return identifiers != null && !identifiers.isEmpty();
- }
- return super.eIsSet(featureID);
- }
-
-} //ComposedIdentifierImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
index 8d11ebb..c8c10ce 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/IdentifierImpl.java
@@ -2,12 +2,16 @@
* <copyright>
* </copyright>
*
- * $Id: IdentifierImpl.java,v 1.1 2008/02/27 13:21:07 sefftinge Exp $
+ * $Id: IdentifierImpl.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3.impl;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.NotificationChain;
import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.InternalEObject;
+import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.xpand3.Identifier;
import org.eclipse.xpand3.Xpand3Package;
@@ -16,11 +20,44 @@ import org.eclipse.xpand3.Xpand3Package;
* An implementation of the model object '<em><b>Identifier</b></em>'.
* <!-- end-user-doc -->
* <p>
+ * The following features are implemented:
+ * <ul>
+ * <li>{@link org.eclipse.xpand3.impl.IdentifierImpl#getNext <em>Next</em>}</li>
+ * <li>{@link org.eclipse.xpand3.impl.IdentifierImpl#getValue <em>Value</em>}</li>
+ * </ul>
* </p>
*
* @generated
*/
-public abstract class IdentifierImpl extends SyntaxElementImpl implements Identifier {
+public class IdentifierImpl extends SyntaxElementImpl implements Identifier {
+ /**
+ * The cached value of the '{@link #getNext() <em>Next</em>}' containment reference.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getNext()
+ * @generated
+ * @ordered
+ */
+ protected Identifier next;
+ /**
+ * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected static final String VALUE_EDEFAULT = null;
+ /**
+ * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getValue()
+ * @generated
+ * @ordered
+ */
+ protected String value = VALUE_EDEFAULT;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -40,4 +77,166 @@ public abstract class IdentifierImpl extends SyntaxElementImpl implements Identi
return Xpand3Package.Literals.IDENTIFIER;
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public Identifier getNext() {
+ return next;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public NotificationChain basicSetNext(Identifier newNext, NotificationChain msgs) {
+ Identifier oldNext = next;
+ next = newNext;
+ if (eNotificationRequired()) {
+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, Xpand3Package.IDENTIFIER__NEXT, oldNext, newNext);
+ if (msgs == null) msgs = notification; else msgs.add(notification);
+ }
+ return msgs;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setNext(Identifier newNext) {
+ if (newNext != next) {
+ NotificationChain msgs = null;
+ if (next != null)
+ msgs = ((InternalEObject)next).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.IDENTIFIER__NEXT, null, msgs);
+ if (newNext != null)
+ msgs = ((InternalEObject)newNext).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - Xpand3Package.IDENTIFIER__NEXT, null, msgs);
+ msgs = basicSetNext(newNext, msgs);
+ if (msgs != null) msgs.dispatch();
+ }
+ else if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IDENTIFIER__NEXT, newNext, newNext));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setValue(String newValue) {
+ String oldValue = value;
+ value = newValue;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.IDENTIFIER__VALUE, oldValue, value));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__NEXT:
+ return basicSetNext(null, msgs);
+ }
+ return super.eInverseRemove(otherEnd, featureID, msgs);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public Object eGet(int featureID, boolean resolve, boolean coreType) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__NEXT:
+ return getNext();
+ case Xpand3Package.IDENTIFIER__VALUE:
+ return getValue();
+ }
+ return super.eGet(featureID, resolve, coreType);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eSet(int featureID, Object newValue) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__NEXT:
+ setNext((Identifier)newValue);
+ return;
+ case Xpand3Package.IDENTIFIER__VALUE:
+ setValue((String)newValue);
+ return;
+ }
+ super.eSet(featureID, newValue);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public void eUnset(int featureID) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__NEXT:
+ setNext((Identifier)null);
+ return;
+ case Xpand3Package.IDENTIFIER__VALUE:
+ setValue(VALUE_EDEFAULT);
+ return;
+ }
+ super.eUnset(featureID);
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ @Override
+ public boolean eIsSet(int featureID) {
+ switch (featureID) {
+ case Xpand3Package.IDENTIFIER__NEXT:
+ return next != null;
+ case Xpand3Package.IDENTIFIER__VALUE:
+ return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
+ }
+ 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(" (value: ");
+ result.append(value);
+ result.append(')');
+ return result.toString();
+ }
+
} //IdentifierImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java
deleted file mode 100644
index 19ff6ee..0000000
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/SimpleIdentifierImpl.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SimpleIdentifierImpl.java,v 1.1 2008/02/27 13:21:07 sefftinge Exp $
- */
-package org.eclipse.xpand3.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
-import org.eclipse.xpand3.SimpleIdentifier;
-import org.eclipse.xpand3.Xpand3Package;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Simple Identifier</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- * <li>{@link org.eclipse.xpand3.impl.SimpleIdentifierImpl#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class SimpleIdentifierImpl extends IdentifierImpl implements SimpleIdentifier {
- /**
- * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected static final String VALUE_EDEFAULT = null;
-
- /**
- * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getValue()
- * @generated
- * @ordered
- */
- protected String value = VALUE_EDEFAULT;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SimpleIdentifierImpl() {
- super();
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- protected EClass eStaticClass() {
- return Xpand3Package.Literals.SIMPLE_IDENTIFIER;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public String getValue() {
- return value;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public void setValue(String newValue) {
- String oldValue = value;
- value = newValue;
- if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, Xpand3Package.SIMPLE_IDENTIFIER__VALUE, oldValue, value));
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public Object eGet(int featureID, boolean resolve, boolean coreType) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- return getValue();
- }
- return super.eGet(featureID, resolve, coreType);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eSet(int featureID, Object newValue) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- setValue((String)newValue);
- return;
- }
- super.eSet(featureID, newValue);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public void eUnset(int featureID) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- setValue(VALUE_EDEFAULT);
- return;
- }
- super.eUnset(featureID);
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- @Override
- public boolean eIsSet(int featureID) {
- switch (featureID) {
- case Xpand3Package.SIMPLE_IDENTIFIER__VALUE:
- return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
- }
- 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(" (value: ");
- result.append(value);
- result.append(')');
- return result.toString();
- }
-
-} //SimpleIdentifierImpl
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
index c6132a6..ec52889 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3FactoryImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3FactoryImpl.java,v 1.1 2008/02/27 13:21:07 sefftinge Exp $
+ * $Id: Xpand3FactoryImpl.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3.impl;
@@ -62,8 +62,7 @@ public class Xpand3FactoryImpl extends EFactoryImpl implements Xpand3Factory {
switch (eClass.getClassifierID()) {
case Xpand3Package.FILE: return createFile();
case Xpand3Package.IMPORT_STATEMENT: return createImportStatement();
- case Xpand3Package.SIMPLE_IDENTIFIER: return createSimpleIdentifier();
- case Xpand3Package.COMPOSED_IDENTIFIER: return createComposedIdentifier();
+ case Xpand3Package.IDENTIFIER: return createIdentifier();
case Xpand3Package.DECLARED_PARAMETER: return createDeclaredParameter();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
@@ -95,19 +94,9 @@ public class Xpand3FactoryImpl extends EFactoryImpl implements Xpand3Factory {
* <!-- end-user-doc -->
* @generated
*/
- public SimpleIdentifier createSimpleIdentifier() {
- SimpleIdentifierImpl simpleIdentifier = new SimpleIdentifierImpl();
- return simpleIdentifier;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ComposedIdentifier createComposedIdentifier() {
- ComposedIdentifierImpl composedIdentifier = new ComposedIdentifierImpl();
- return composedIdentifier;
+ public Identifier createIdentifier() {
+ IdentifierImpl identifier = new IdentifierImpl();
+ return identifier;
}
/**
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
index 833fe96..9b3253b 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/impl/Xpand3PackageImpl.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3PackageImpl.java,v 1.1 2008/02/27 13:21:07 sefftinge Exp $
+ * $Id: Xpand3PackageImpl.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3.impl;
@@ -75,20 +75,6 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
* <!-- end-user-doc -->
* @generated
*/
- private EClass simpleIdentifierEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EClass composedIdentifierEClass = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
private EClass declaredParameterEClass = null;
/**
@@ -283,17 +269,8 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
* <!-- end-user-doc -->
* @generated
*/
- public EClass getSimpleIdentifier() {
- return simpleIdentifierEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EAttribute getSimpleIdentifier_Value() {
- return (EAttribute)simpleIdentifierEClass.getEStructuralFeatures().get(0);
+ public EReference getIdentifier_Next() {
+ return (EReference)identifierEClass.getEStructuralFeatures().get(0);
}
/**
@@ -301,17 +278,8 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
* <!-- end-user-doc -->
* @generated
*/
- public EClass getComposedIdentifier() {
- return composedIdentifierEClass;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EReference getComposedIdentifier_Identifiers() {
- return (EReference)composedIdentifierEClass.getEStructuralFeatures().get(0);
+ public EAttribute getIdentifier_Value() {
+ return (EAttribute)identifierEClass.getEStructuralFeatures().get(1);
}
/**
@@ -384,12 +352,8 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
createEAttribute(importStatementEClass, IMPORT_STATEMENT__EXPORTED);
identifierEClass = createEClass(IDENTIFIER);
-
- simpleIdentifierEClass = createEClass(SIMPLE_IDENTIFIER);
- createEAttribute(simpleIdentifierEClass, SIMPLE_IDENTIFIER__VALUE);
-
- composedIdentifierEClass = createEClass(COMPOSED_IDENTIFIER);
- createEReference(composedIdentifierEClass, COMPOSED_IDENTIFIER__IDENTIFIERS);
+ createEReference(identifierEClass, IDENTIFIER__NEXT);
+ createEAttribute(identifierEClass, IDENTIFIER__VALUE);
declaredParameterEClass = createEClass(DECLARED_PARAMETER);
createEReference(declaredParameterEClass, DECLARED_PARAMETER__NAME);
@@ -437,8 +401,6 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
fileEClass.getESuperTypes().add(this.getSyntaxElement());
importStatementEClass.getESuperTypes().add(this.getSyntaxElement());
identifierEClass.getESuperTypes().add(this.getSyntaxElement());
- simpleIdentifierEClass.getESuperTypes().add(this.getIdentifier());
- composedIdentifierEClass.getESuperTypes().add(this.getIdentifier());
declaredParameterEClass.getESuperTypes().add(this.getSyntaxElement());
// Initialize classes and features; add operations and parameters
@@ -456,13 +418,9 @@ public class Xpand3PackageImpl extends EPackageImpl implements Xpand3Package {
initEReference(getImportStatement_ImportedId(), this.getIdentifier(), null, "importedId", null, 0, 1, ImportStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getImportStatement_Exported(), ecorePackage.getEBoolean(), "exported", null, 0, 1, ImportStatement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEClass(identifierEClass, Identifier.class, "Identifier", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-
- initEClass(simpleIdentifierEClass, SimpleIdentifier.class, "SimpleIdentifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getSimpleIdentifier_Value(), ecorePackage.getEString(), "value", null, 0, 1, SimpleIdentifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
- initEClass(composedIdentifierEClass, ComposedIdentifier.class, "ComposedIdentifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEReference(getComposedIdentifier_Identifiers(), this.getIdentifier(), null, "identifiers", null, 1, -1, ComposedIdentifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(identifierEClass, Identifier.class, "Identifier", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEReference(getIdentifier_Next(), this.getIdentifier(), null, "next", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getIdentifier_Value(), ecorePackage.getEString(), "value", null, 0, 1, Identifier.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(declaredParameterEClass, DeclaredParameter.class, "DeclaredParameter", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEReference(getDeclaredParameter_Name(), this.getIdentifier(), null, "name", null, 0, 1, DeclaredParameter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
index d8d0511..292a609 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3AdapterFactory.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3AdapterFactory.java,v 1.1 2008/02/27 13:21:09 sefftinge Exp $
+ * $Id: Xpand3AdapterFactory.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3.util;
@@ -88,14 +88,6 @@ public class Xpand3AdapterFactory extends AdapterFactoryImpl {
return createIdentifierAdapter();
}
@Override
- public Adapter caseSimpleIdentifier(SimpleIdentifier object) {
- return createSimpleIdentifierAdapter();
- }
- @Override
- public Adapter caseComposedIdentifier(ComposedIdentifier object) {
- return createComposedIdentifierAdapter();
- }
- @Override
public Adapter caseDeclaredParameter(DeclaredParameter object) {
return createDeclaredParameterAdapter();
}
@@ -176,34 +168,6 @@ public class Xpand3AdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.SimpleIdentifier <em>Simple Identifier</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.xpand3.SimpleIdentifier
- * @generated
- */
- public Adapter createSimpleIdentifierAdapter() {
- return null;
- }
-
- /**
- * Creates a new adapter for an object of class '{@link org.eclipse.xpand3.ComposedIdentifier <em>Composed Identifier</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.xpand3.ComposedIdentifier
- * @generated
- */
- public Adapter createComposedIdentifierAdapter() {
- return null;
- }
-
- /**
* Creates a new adapter for an object of class '{@link org.eclipse.xpand3.DeclaredParameter <em>Declared Parameter</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
diff --git a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
index 4a8074f..a7e5f49 100644
--- a/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
+++ b/plugins/org.eclipse.xpand3/emf-gen/org/eclipse/xpand3/util/Xpand3Switch.java
@@ -2,7 +2,7 @@
* <copyright>
* </copyright>
*
- * $Id: Xpand3Switch.java,v 1.1 2008/02/27 13:21:09 sefftinge Exp $
+ * $Id: Xpand3Switch.java,v 1.2 2008/03/04 09:20:37 sefftinge Exp $
*/
package org.eclipse.xpand3.util;
@@ -114,22 +114,6 @@ public class Xpand3Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case Xpand3Package.SIMPLE_IDENTIFIER: {
- SimpleIdentifier simpleIdentifier = (SimpleIdentifier)theEObject;
- T result = caseSimpleIdentifier(simpleIdentifier);
- if (result == null) result = caseIdentifier(simpleIdentifier);
- if (result == null) result = caseSyntaxElement(simpleIdentifier);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
- case Xpand3Package.COMPOSED_IDENTIFIER: {
- ComposedIdentifier composedIdentifier = (ComposedIdentifier)theEObject;
- T result = caseComposedIdentifier(composedIdentifier);
- if (result == null) result = caseIdentifier(composedIdentifier);
- if (result == null) result = caseSyntaxElement(composedIdentifier);
- if (result == null) result = defaultCase(theEObject);
- return result;
- }
case Xpand3Package.DECLARED_PARAMETER: {
DeclaredParameter declaredParameter = (DeclaredParameter)theEObject;
T result = caseDeclaredParameter(declaredParameter);
@@ -202,36 +186,6 @@ public class Xpand3Switch<T> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Simple Identifier</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>Simple Identifier</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseSimpleIdentifier(SimpleIdentifier object) {
- return null;
- }
-
- /**
- * Returns the result of interpreting the object as an instance of '<em>Composed Identifier</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>Composed Identifier</em>'.
- * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
- * @generated
- */
- public T caseComposedIdentifier(ComposedIdentifier object) {
- return null;
- }
-
- /**
* Returns the result of interpreting the object as an instance of '<em>Declared Parameter</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
diff --git a/plugins/org.eclipse.xpand3/src/xpand3.ecore b/plugins/org.eclipse.xpand3/src/xpand3.ecore
index f6ac344..2c5af75 100644
--- a/plugins/org.eclipse.xpand3/src/xpand3.ecore
+++ b/plugins/org.eclipse.xpand3/src/xpand3.ecore
@@ -20,14 +20,11 @@
containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="exported" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Identifier" abstract="true" eSuperTypes="#//SyntaxElement"/>
- <eClassifiers xsi:type="ecore:EClass" name="SimpleIdentifier" eSuperTypes="#//Identifier">
+ <eClassifiers xsi:type="ecore:EClass" name="Identifier" eSuperTypes="#//SyntaxElement">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="next" eType="#//Identifier"
+ containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ComposedIdentifier" eSuperTypes="#//Identifier">
- <eStructuralFeatures xsi:type="ecore:EReference" name="identifiers" lowerBound="1"
- upperBound="-1" eType="#//Identifier" containment="true"/>
- </eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="DeclaredParameter" eSuperTypes="#//SyntaxElement">
<eStructuralFeatures xsi:type="ecore:EReference" name="name" eType="#//Identifier"
containment="true"/>