Attachment 152616 Details for Bug 295628 – Java Metamodel evolution

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Java Metamodel evolution

org.eclipse.gmt.modisco.java.patch (text/plain), 980.86 KB, created by Fabien Giquel

on 2009-11-19 12:44:22 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Fabien Giquel

Created: 2009-11-19 12:44:22 EST

Size: 980.86 KB

patch

obsolete

>Index: META-INF/MANIFEST.MF
>===================================================================
>--- META-INF/MANIFEST.MF	(revision 417)
>+++ META-INF/MANIFEST.MF	(working copy)
>@@ -1,15 +1,16 @@
> Manifest-Version: 1.0
> Bundle-ManifestVersion: 2
>-Bundle-Name: %pluginName
>+Bundle-Name: %Bundle-Name
> Bundle-SymbolicName: org.eclipse.gmt.modisco.java;singleton:=true
>-Bundle-Version: 0.6.0.qualifier
>+Bundle-Version: 0.7.0.qualifier
> Bundle-ClassPath: .
>-Bundle-Vendor: %providerName
>+Bundle-Vendor: %Bundle-Vendor
> Bundle-Localization: plugin
> Bundle-RequiredExecutionEnvironment: J2SE-1.5
> Require-Bundle: org.eclipse.core.runtime,
> org.eclipse.emf.ecore,
>- org.eclipse.emf.ecore.xmi
>+ org.eclipse.emf.ecore.xmi,
>+ org.eclipse.gmt.modisco.common.core;bundle-version="0.7.0"
> Bundle-ActivationPolicy: lazy
> Export-Package: 
> org.eclipse.gmt.modisco.java,
>Index: plugin.properties
>===================================================================
>--- plugin.properties	(revision 417)
>+++ plugin.properties	(working copy)
>@@ -1,18 +1,20 @@
>-###############################################################################
>+
>+# *******************************************************************************
> # Copyright (c) 2008 Mia-Software.
> # All rights reserved. This program and the accompanying materials
> # are made available under the terms of the Eclipse Public License v1.0
> # which accompanies this distribution, and is available at
> # http://www.eclipse.org/legal/epl-v10.html
>-#
>+# 
> # Contributors:
> # Sébastien Minguet (Mia-Software) - initial API and implementation
> # Frédéric Madiot (Mia-Software) - initial API and implementation
> # Fabien Giquel (Mia-Software) - initial API and implementation
> # Gabriel Barbier (Mia-Software) - initial API and implementation
> # Erwan Breton (Sodifrance) - initial API and implementation
>-# Romain Dervaux (Mia-Software) - initial API and implementation
>-###############################################################################
>-
>-pluginName = MoDisco Java Metamodel (Incubation)
>-providerName = Eclipse Modeling Project
>+# *******************************************************************************
>+#
>+# $Id$
>+Bundle-Vendor = Eclipse Modeling Project
>+Bundle-Name = Java Metamodel (Incubation)
>+content-type.name = Java code model
>\ No newline at end of file
>Index: build.properties
>===================================================================
>--- build.properties	(revision 417)
>+++ build.properties	(working copy)
>@@ -1,9 +1,9 @@
>-###############################################################################
>-# Copyright (c) 2009 Mia-Software.
>-# All rights reserved. This program and the accompanying materials
>-# are made available under the terms of the Eclipse Public License v1.0
>-# which accompanies this distribution, and is available at
>-# http://www.eclipse.org/legal/epl-v10.html
>+
>+#Copyright (c) 2009 Mia-Software.
>+#All rights reserved. This program and the accompanying materials
>+#are made available under the terms of the Eclipse Public License v1.0
>+#which accompanies this distribution, and is available at
>+#http://www.eclipse.org/legal/epl-v10.html
> #
> # Contributors:
> # Sébastien Minguet (Mia-Software) - initial API and implementation
>Index: plugin.xml
>===================================================================
>--- plugin.xml	(revision 417)
>+++ plugin.xml	(working copy)
>@@ -27,10 +27,10 @@
> <package
> class="org.eclipse.gmt.modisco.java.emf.JavaPackage"
> genModel="model/java.genmodel"
>- uri="http://www.eclipse.org/MoDisco/Java">
>+ uri="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java">
> </package>
> </extension>
>-
>+ 
> 
> <extension
> point="org.eclipse.core.contenttype.contentTypes">
>@@ -38,7 +38,7 @@
> base-type="org.eclipse.emf.ecore.xmi"
> file-extensions="javaxmi"
> id="org.eclipse.gmt.modisco.java.contenttype"
>- name="Java code model"
>+ name="%content-type.name"
> priority="normal">
> </content-type>
> </extension>
>Index: src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Statement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Statement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Statement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Expression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Expression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Expression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/InheritanceKind.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/InheritanceKind.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/InheritanceKind.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	NONE(1, "none", "none"),
>+	NONE(1, "none", "none"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'Abstract' literal object.
>@@ -53,7 +54,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	ABSTRACT(2, "abstract", "abstract"),
>+	ABSTRACT(2, "abstract", "abstract"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'Final' literal object.
>@@ -63,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	FINAL(3, "final", "final");
>+	FINAL(3, "final", "final"); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'None' literal value.
>Index: src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/StringLiteral.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/StringLiteral.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/StringLiteral.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/TypeLiteral.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TypeLiteral.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TypeLiteral.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/TextElement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TextElement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TextElement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ClassDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ClassDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ClassDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/MemberRef.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/MemberRef.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/MemberRef.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedItem.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedItem.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedItem.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ReturnStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ReturnStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ReturnStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/EmptyStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/EmptyStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/EmptyStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -29,8 +30,6 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#isVarargs Varargs}</li>
>- * <li>{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getBody Body}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getParameters Parameters}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getThrownExceptions Thrown Exceptions}</li>
>@@ -46,47 +45,6 @@
> */
> public interface AbstractMethodDeclaration extends BodyDeclaration {
> 	/**
>-	 * Returns the value of the 'Varargs' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Varargs' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Varargs' attribute.
>-	 * @see #setVarargs(boolean)
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getAbstractMethodDeclaration_Varargs()
>-	 * @model unique="false" required="true" ordered="false"
>-	 * @generated
>-	 */
>-	boolean isVarargs();
>-
>-	/**
>-	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#isVarargs Varargs}' attribute.
>-	 * 
>-	 * 
>-	 * @param value the new value of the 'Varargs' attribute.
>-	 * @see #isVarargs()
>-	 * @generated
>-	 */
>-	void setVarargs(boolean value);
>-
>-	/**
>-	 * Returns the value of the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Qualified Name' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Qualified Name' attribute.
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getAbstractMethodDeclaration_QualifiedName()
>-	 * @model unique="false" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
>-	 * @generated
>-	 */
>-	String getQualifiedName();
>-
>-	/**
> 	 * Returns the value of the 'Body' containment reference.
> 	 * 
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/Type.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Type.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Type.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/MethodDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/MethodDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/MethodDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedType.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedType.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedType.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PostfixExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PostfixExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PostfixExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/FieldDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/FieldDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/FieldDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java	(working copy)
>@@ -21,131 +21,9 @@
> 
> import org.eclipse.emf.common.notify.Adapter;
> import org.eclipse.emf.common.notify.Notifier;
>-
> import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
>-
> import org.eclipse.emf.ecore.EObject;
>-
>-import org.eclipse.gmt.modisco.java.ASTNode;
>-import org.eclipse.gmt.modisco.java.AbstractMethodDeclaration;
>-import org.eclipse.gmt.modisco.java.AbstractMethodInvocation;
>-import org.eclipse.gmt.modisco.java.AbstractTypeDeclaration;
>-import org.eclipse.gmt.modisco.java.AbstractTypeQualifiedExpression;
>-import org.eclipse.gmt.modisco.java.AbstractVariablesContainer;
>-import org.eclipse.gmt.modisco.java.Annotation;
>-import org.eclipse.gmt.modisco.java.AnnotationMemberValuePair;
>-import org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration;
>-import org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration;
>-import org.eclipse.gmt.modisco.java.AnonymousClassDeclaration;
>-import org.eclipse.gmt.modisco.java.ArrayAccess;
>-import org.eclipse.gmt.modisco.java.ArrayCreation;
>-import org.eclipse.gmt.modisco.java.ArrayInitializer;
>-import org.eclipse.gmt.modisco.java.ArrayLengthAccess;
>-import org.eclipse.gmt.modisco.java.ArrayType;
>-import org.eclipse.gmt.modisco.java.AssertStatement;
>-import org.eclipse.gmt.modisco.java.Assignment;
>-import org.eclipse.gmt.modisco.java.Block;
>-import org.eclipse.gmt.modisco.java.BlockComment;
>-import org.eclipse.gmt.modisco.java.BodyDeclaration;
>-import org.eclipse.gmt.modisco.java.BooleanLiteral;
>-import org.eclipse.gmt.modisco.java.BreakStatement;
>-import org.eclipse.gmt.modisco.java.CastExpression;
>-import org.eclipse.gmt.modisco.java.CatchClause;
>-import org.eclipse.gmt.modisco.java.CharacterLiteral;
>-import org.eclipse.gmt.modisco.java.ClassDeclaration;
>-import org.eclipse.gmt.modisco.java.ClassInstanceCreation;
>-import org.eclipse.gmt.modisco.java.Comment;
>-import org.eclipse.gmt.modisco.java.CompilationUnit;
>-import org.eclipse.gmt.modisco.java.ConditionalExpression;
>-import org.eclipse.gmt.modisco.java.ConstructorDeclaration;
>-import org.eclipse.gmt.modisco.java.ConstructorInvocation;
>-import org.eclipse.gmt.modisco.java.ContinueStatement;
>-import org.eclipse.gmt.modisco.java.DoStatement;
>-import org.eclipse.gmt.modisco.java.EmptyStatement;
>-import org.eclipse.gmt.modisco.java.EnhancedForStatement;
>-import org.eclipse.gmt.modisco.java.EnumConstantDeclaration;
>-import org.eclipse.gmt.modisco.java.EnumDeclaration;
>-import org.eclipse.gmt.modisco.java.Expression;
>-import org.eclipse.gmt.modisco.java.ExpressionStatement;
>-import org.eclipse.gmt.modisco.java.FieldAccess;
>-import org.eclipse.gmt.modisco.java.FieldDeclaration;
>-import org.eclipse.gmt.modisco.java.ForStatement;
>-import org.eclipse.gmt.modisco.java.IfStatement;
>-import org.eclipse.gmt.modisco.java.ImportDeclaration;
>-import org.eclipse.gmt.modisco.java.InfixExpression;
>-import org.eclipse.gmt.modisco.java.Initializer;
>-import org.eclipse.gmt.modisco.java.InstanceofExpression;
>-import org.eclipse.gmt.modisco.java.InterfaceDeclaration;
>-import org.eclipse.gmt.modisco.java.Javadoc;
>-import org.eclipse.gmt.modisco.java.LabeledStatement;
>-import org.eclipse.gmt.modisco.java.LineComment;
>-import org.eclipse.gmt.modisco.java.MemberRef;
>-import org.eclipse.gmt.modisco.java.MethodDeclaration;
>-import org.eclipse.gmt.modisco.java.MethodInvocation;
>-import org.eclipse.gmt.modisco.java.MethodRef;
>-import org.eclipse.gmt.modisco.java.MethodRefParameter;
>-import org.eclipse.gmt.modisco.java.Model;
>-import org.eclipse.gmt.modisco.java.Modifier;
>-import org.eclipse.gmt.modisco.java.NamedElement;
>-import org.eclipse.gmt.modisco.java.NullLiteral;
>-import org.eclipse.gmt.modisco.java.NumberLiteral;
>-import org.eclipse.gmt.modisco.java.PackageAccess;
>-import org.eclipse.gmt.modisco.java.ParameterizedType;
>-import org.eclipse.gmt.modisco.java.ParenthesizedExpression;
>-import org.eclipse.gmt.modisco.java.PostfixExpression;
>-import org.eclipse.gmt.modisco.java.PrefixExpression;
>-import org.eclipse.gmt.modisco.java.PrimitiveType;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeBoolean;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeByte;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeChar;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeDouble;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeFloat;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeInt;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeLong;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeShort;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeVoid;
>-import org.eclipse.gmt.modisco.java.ReturnStatement;
>-import org.eclipse.gmt.modisco.java.SingleVariableAccess;
>-import org.eclipse.gmt.modisco.java.SingleVariableDeclaration;
>-import org.eclipse.gmt.modisco.java.Statement;
>-import org.eclipse.gmt.modisco.java.StringLiteral;
>-import org.eclipse.gmt.modisco.java.SuperConstructorInvocation;
>-import org.eclipse.gmt.modisco.java.SuperFieldAccess;
>-import org.eclipse.gmt.modisco.java.SuperMethodInvocation;
>-import org.eclipse.gmt.modisco.java.SwitchCase;
>-import org.eclipse.gmt.modisco.java.SwitchStatement;
>-import org.eclipse.gmt.modisco.java.SynchronizedStatement;
>-import org.eclipse.gmt.modisco.java.TagElement;
>-import org.eclipse.gmt.modisco.java.TextElement;
>-import org.eclipse.gmt.modisco.java.ThisExpression;
>-import org.eclipse.gmt.modisco.java.ThrowStatement;
>-import org.eclipse.gmt.modisco.java.TryStatement;
>-import org.eclipse.gmt.modisco.java.Type;
>-import org.eclipse.gmt.modisco.java.TypeAccess;
>-import org.eclipse.gmt.modisco.java.TypeDeclaration;
>-import org.eclipse.gmt.modisco.java.TypeDeclarationStatement;
>-import org.eclipse.gmt.modisco.java.TypeLiteral;
>-import org.eclipse.gmt.modisco.java.TypeParameter;
>-import org.eclipse.gmt.modisco.java.UnresolvedAnnotationDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedAnnotationTypeMemberDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedClassDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedEnumDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedInterfaceDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedItem;
>-import org.eclipse.gmt.modisco.java.UnresolvedItemAccess;
>-import org.eclipse.gmt.modisco.java.UnresolvedLabeledStatement;
>-import org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedSingleVariableDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedType;
>-import org.eclipse.gmt.modisco.java.UnresolvedTypeDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedVariableDeclarationFragment;
>-import org.eclipse.gmt.modisco.java.VariableDeclaration;
>-import org.eclipse.gmt.modisco.java.VariableDeclarationExpression;
>-import org.eclipse.gmt.modisco.java.VariableDeclarationFragment;
>-import org.eclipse.gmt.modisco.java.VariableDeclarationStatement;
>-import org.eclipse.gmt.modisco.java.WhileStatement;
>-import org.eclipse.gmt.modisco.java.WildCardType;
>-
>+import org.eclipse.gmt.modisco.java.*;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
> 
> /**
>@@ -229,6 +107,10 @@
> 				return createAnnotationAdapter();
> 			}
> 			@Override
>+			public Adapter caseArchive(Archive object) {
>+				return createArchiveAdapter();
>+			}
>+			@Override
> 			public Adapter caseAssertStatement(AssertStatement object) {
> 				return createAssertStatementAdapter();
> 			}
>@@ -309,6 +191,10 @@
> 				return createCharacterLiteralAdapter();
> 			}
> 			@Override
>+			public Adapter caseClassFile(ClassFile object) {
>+				return createClassFileAdapter();
>+			}
>+			@Override
> 			public Adapter caseClassInstanceCreation(ClassInstanceCreation object) {
> 				return createClassInstanceCreationAdapter();
> 			}
>@@ -417,6 +303,18 @@
> 				return createLineCommentAdapter();
> 			}
> 			@Override
>+			public Adapter caseManifest(Manifest object) {
>+				return createManifestAdapter();
>+			}
>+			@Override
>+			public Adapter caseManifestAttribute(ManifestAttribute object) {
>+				return createManifestAttributeAdapter();
>+			}
>+			@Override
>+			public Adapter caseManifestEntry(ManifestEntry object) {
>+				return createManifestEntryAdapter();
>+			}
>+			@Override
> 			public Adapter caseMemberRef(MemberRef object) {
> 				return createMemberRefAdapter();
> 			}
>@@ -449,6 +347,10 @@
> 				return createNamedElementAdapter();
> 			}
> 			@Override
>+			public Adapter caseNamespaceAccess(NamespaceAccess object) {
>+				return createNamespaceAccessAdapter();
>+			}
>+			@Override
> 			public Adapter caseNumberLiteral(NumberLiteral object) {
> 				return createNumberLiteralAdapter();
> 			}
>@@ -705,758 +607,842 @@
> 
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration Abstract Method Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ASTNode AST Node}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractMethodDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.ASTNode
> 	 * @generated
> 	 */
>-	public Adapter createAbstractMethodDeclarationAdapter() {
>+	public Adapter createASTNodeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractMethodInvocation Abstract Method Invocation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CompilationUnit Compilation Unit}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractMethodInvocation
>+	 * @see org.eclipse.gmt.modisco.java.CompilationUnit
> 	 * @generated
> 	 */
>-	public Adapter createAbstractMethodInvocationAdapter() {
>+	public Adapter createCompilationUnitAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration Abstract Type Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ImportDeclaration Import Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractTypeDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.ImportDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createAbstractTypeDeclarationAdapter() {
>+	public Adapter createImportDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractTypeQualifiedExpression Abstract Type Qualified Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Model Model}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractTypeQualifiedExpression
>+	 * @see org.eclipse.gmt.modisco.java.Model
> 	 * @generated
> 	 */
>-	public Adapter createAbstractTypeQualifiedExpressionAdapter() {
>+	public Adapter createModelAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractVariablesContainer Abstract Variables Container}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Modifier Modifier}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractVariablesContainer
>+	 * @see org.eclipse.gmt.modisco.java.Modifier
> 	 * @generated
> 	 */
>-	public Adapter createAbstractVariablesContainerAdapter() {
>+	public Adapter createModifierAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Annotation Annotation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Package Package}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Annotation
>+	 * @see org.eclipse.gmt.modisco.java.Package
> 	 * @generated
> 	 */
>-	public Adapter createAnnotationAdapter() {
>+	public Adapter createPackageAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AssertStatement Assert Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NamedElement Named Element}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AssertStatement
>+	 * @see org.eclipse.gmt.modisco.java.NamedElement
> 	 * @generated
> 	 */
>-	public Adapter createAssertStatementAdapter() {
>+	public Adapter createNamedElementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ASTNode AST Node}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NamespaceAccess Namespace Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ASTNode
>+	 * @see org.eclipse.gmt.modisco.java.NamespaceAccess
> 	 * @generated
> 	 */
>-	public Adapter createASTNodeAdapter() {
>+	public Adapter createNamespaceAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnnotationMemberValuePair Annotation Member Value Pair}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedItem Unresolved Item}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AnnotationMemberValuePair
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedItem
> 	 * @generated
> 	 */
>-	public Adapter createAnnotationMemberValuePairAdapter() {
>+	public Adapter createUnresolvedItemAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration Annotation Type Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedItemAccess Unresolved Item Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedItemAccess
> 	 * @generated
> 	 */
>-	public Adapter createAnnotationTypeDeclarationAdapter() {
>+	public Adapter createUnresolvedItemAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration Annotation Type Member Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Comment Comment}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.Comment
> 	 * @generated
> 	 */
>-	public Adapter createAnnotationTypeMemberDeclarationAdapter() {
>+	public Adapter createCommentAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnonymousClassDeclaration Anonymous Class Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BlockComment Block Comment}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.AnonymousClassDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.BlockComment
> 	 * @generated
> 	 */
>-	public Adapter createAnonymousClassDeclarationAdapter() {
>+	public Adapter createBlockCommentAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayAccess Array Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Javadoc Javadoc}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ArrayAccess
>+	 * @see org.eclipse.gmt.modisco.java.Javadoc
> 	 * @generated
> 	 */
>-	public Adapter createArrayAccessAdapter() {
>+	public Adapter createJavadocAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayCreation Array Creation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.LineComment Line Comment}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ArrayCreation
>+	 * @see org.eclipse.gmt.modisco.java.LineComment
> 	 * @generated
> 	 */
>-	public Adapter createArrayCreationAdapter() {
>+	public Adapter createLineCommentAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayInitializer Array Initializer}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Manifest Manifest}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ArrayInitializer
>+	 * @see org.eclipse.gmt.modisco.java.Manifest
> 	 * @generated
> 	 */
>-	public Adapter createArrayInitializerAdapter() {
>+	public Adapter createManifestAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayLengthAccess Array Length Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ManifestAttribute Manifest Attribute}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ArrayLengthAccess
>+	 * @see org.eclipse.gmt.modisco.java.ManifestAttribute
> 	 * @generated
> 	 */
>-	public Adapter createArrayLengthAccessAdapter() {
>+	public Adapter createManifestAttributeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayType Array Type}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ManifestEntry Manifest Entry}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ArrayType
>+	 * @see org.eclipse.gmt.modisco.java.ManifestEntry
> 	 * @generated
> 	 */
>-	public Adapter createArrayTypeAdapter() {
>+	public Adapter createManifestEntryAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Assignment Assignment}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MemberRef Member Ref}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Assignment
>+	 * @see org.eclipse.gmt.modisco.java.MemberRef
> 	 * @generated
> 	 */
>-	public Adapter createAssignmentAdapter() {
>+	public Adapter createMemberRefAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BodyDeclaration Body Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MethodRef Method Ref}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.BodyDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.MethodRef
> 	 * @generated
> 	 */
>-	public Adapter createBodyDeclarationAdapter() {
>+	public Adapter createMethodRefAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BooleanLiteral Boolean Literal}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MethodRefParameter Method Ref Parameter}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.BooleanLiteral
>+	 * @see org.eclipse.gmt.modisco.java.MethodRefParameter
> 	 * @generated
> 	 */
>-	public Adapter createBooleanLiteralAdapter() {
>+	public Adapter createMethodRefParameterAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BlockComment Block Comment}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TagElement Tag Element}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.BlockComment
>+	 * @see org.eclipse.gmt.modisco.java.TagElement
> 	 * @generated
> 	 */
>-	public Adapter createBlockCommentAdapter() {
>+	public Adapter createTagElementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Block Block}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TextElement Text Element}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Block
>+	 * @see org.eclipse.gmt.modisco.java.TextElement
> 	 * @generated
> 	 */
>-	public Adapter createBlockAdapter() {
>+	public Adapter createTextElementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BreakStatement Break Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration Abstract Type Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.BreakStatement
>+	 * @see org.eclipse.gmt.modisco.java.AbstractTypeDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createBreakStatementAdapter() {
>+	public Adapter createAbstractTypeDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CastExpression Cast Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration Annotation Type Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.CastExpression
>+	 * @see org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createCastExpressionAdapter() {
>+	public Adapter createAnnotationTypeDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CatchClause Catch Clause}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnonymousClassDeclaration Anonymous Class Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.CatchClause
>+	 * @see org.eclipse.gmt.modisco.java.AnonymousClassDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createCatchClauseAdapter() {
>+	public Adapter createAnonymousClassDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CharacterLiteral Character Literal}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayType Array Type}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.CharacterLiteral
>+	 * @see org.eclipse.gmt.modisco.java.ArrayType
> 	 * @generated
> 	 */
>-	public Adapter createCharacterLiteralAdapter() {
>+	public Adapter createArrayTypeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ClassInstanceCreation Class Instance Creation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ClassDeclaration Class Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ClassInstanceCreation
>+	 * @see org.eclipse.gmt.modisco.java.ClassDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createClassInstanceCreationAdapter() {
>+	public Adapter createClassDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ConstructorDeclaration Constructor Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EnumDeclaration Enum Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ConstructorDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.EnumDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createConstructorDeclarationAdapter() {
>+	public Adapter createEnumDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ConditionalExpression Conditional Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.InterfaceDeclaration Interface Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ConditionalExpression
>+	 * @see org.eclipse.gmt.modisco.java.InterfaceDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createConditionalExpressionAdapter() {
>+	public Adapter createInterfaceDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ConstructorInvocation Constructor Invocation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ParameterizedType Parameterized Type}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ConstructorInvocation
>+	 * @see org.eclipse.gmt.modisco.java.ParameterizedType
> 	 * @generated
> 	 */
>-	public Adapter createConstructorInvocationAdapter() {
>+	public Adapter createParameterizedTypeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ClassDeclaration Class Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveType Primitive Type}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ClassDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveType
> 	 * @generated
> 	 */
>-	public Adapter createClassDeclarationAdapter() {
>+	public Adapter createPrimitiveTypeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Comment Comment}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeBoolean Primitive Type Boolean}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Comment
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeBoolean
> 	 * @generated
> 	 */
>-	public Adapter createCommentAdapter() {
>+	public Adapter createPrimitiveTypeBooleanAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CompilationUnit Compilation Unit}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeByte Primitive Type Byte}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.CompilationUnit
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeByte
> 	 * @generated
> 	 */
>-	public Adapter createCompilationUnitAdapter() {
>+	public Adapter createPrimitiveTypeByteAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ContinueStatement Continue Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeChar Primitive Type Char}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ContinueStatement
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeChar
> 	 * @generated
> 	 */
>-	public Adapter createContinueStatementAdapter() {
>+	public Adapter createPrimitiveTypeCharAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.DoStatement Do Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeDouble Primitive Type Double}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.DoStatement
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeDouble
> 	 * @generated
> 	 */
>-	public Adapter createDoStatementAdapter() {
>+	public Adapter createPrimitiveTypeDoubleAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EmptyStatement Empty Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeShort Primitive Type Short}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.EmptyStatement
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeShort
> 	 * @generated
> 	 */
>-	public Adapter createEmptyStatementAdapter() {
>+	public Adapter createPrimitiveTypeShortAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EnhancedForStatement Enhanced For Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeFloat Primitive Type Float}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.EnhancedForStatement
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeFloat
> 	 * @generated
> 	 */
>-	public Adapter createEnhancedForStatementAdapter() {
>+	public Adapter createPrimitiveTypeFloatAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EnumConstantDeclaration Enum Constant Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeInt Primitive Type Int}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.EnumConstantDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeInt
> 	 * @generated
> 	 */
>-	public Adapter createEnumConstantDeclarationAdapter() {
>+	public Adapter createPrimitiveTypeIntAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EnumDeclaration Enum Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeLong Primitive Type Long}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.EnumDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeLong
> 	 * @generated
> 	 */
>-	public Adapter createEnumDeclarationAdapter() {
>+	public Adapter createPrimitiveTypeLongAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Expression Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeVoid Primitive Type Void}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Expression
>+	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeVoid
> 	 * @generated
> 	 */
>-	public Adapter createExpressionAdapter() {
>+	public Adapter createPrimitiveTypeVoidAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ExpressionStatement Expression Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Type Type}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ExpressionStatement
>+	 * @see org.eclipse.gmt.modisco.java.Type
> 	 * @generated
> 	 */
>-	public Adapter createExpressionStatementAdapter() {
>+	public Adapter createTypeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.FieldAccess Field Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeDeclaration Type Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.FieldAccess
>+	 * @see org.eclipse.gmt.modisco.java.TypeDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createFieldAccessAdapter() {
>+	public Adapter createTypeDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.FieldDeclaration Field Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeParameter Type Parameter}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.FieldDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.TypeParameter
> 	 * @generated
> 	 */
>-	public Adapter createFieldDeclarationAdapter() {
>+	public Adapter createTypeParameterAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ForStatement For Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedAnnotationDeclaration Unresolved Annotation Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ForStatement
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedAnnotationDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createForStatementAdapter() {
>+	public Adapter createUnresolvedAnnotationDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.IfStatement If Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedClassDeclaration Unresolved Class Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.IfStatement
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedClassDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createIfStatementAdapter() {
>+	public Adapter createUnresolvedClassDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ImportDeclaration Import Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedEnumDeclaration Unresolved Enum Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ImportDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedEnumDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createImportDeclarationAdapter() {
>+	public Adapter createUnresolvedEnumDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.InfixExpression Infix Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedInterfaceDeclaration Unresolved Interface Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.InfixExpression
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedInterfaceDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createInfixExpressionAdapter() {
>+	public Adapter createUnresolvedInterfaceDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Initializer Initializer}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedType Unresolved Type}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Initializer
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedType
> 	 * @generated
> 	 */
>-	public Adapter createInitializerAdapter() {
>+	public Adapter createUnresolvedTypeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.InstanceofExpression Instanceof Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedTypeDeclaration Unresolved Type Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.InstanceofExpression
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedTypeDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createInstanceofExpressionAdapter() {
>+	public Adapter createUnresolvedTypeDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.InterfaceDeclaration Interface Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.WildCardType Wild Card Type}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.InterfaceDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.WildCardType
> 	 * @generated
> 	 */
>-	public Adapter createInterfaceDeclarationAdapter() {
>+	public Adapter createWildCardTypeAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Javadoc Javadoc}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration Abstract Method Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Javadoc
>+	 * @see org.eclipse.gmt.modisco.java.AbstractMethodDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createJavadocAdapter() {
>+	public Adapter createAbstractMethodDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.LabeledStatement Labeled Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractMethodInvocation Abstract Method Invocation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.LabeledStatement
>+	 * @see org.eclipse.gmt.modisco.java.AbstractMethodInvocation
> 	 * @generated
> 	 */
>-	public Adapter createLabeledStatementAdapter() {
>+	public Adapter createAbstractMethodInvocationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.LineComment Line Comment}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractVariablesContainer Abstract Variables Container}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.LineComment
>+	 * @see org.eclipse.gmt.modisco.java.AbstractVariablesContainer
> 	 * @generated
> 	 */
>-	public Adapter createLineCommentAdapter() {
>+	public Adapter createAbstractVariablesContainerAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MemberRef Member Ref}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnnotationMemberValuePair Annotation Member Value Pair}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.MemberRef
>+	 * @see org.eclipse.gmt.modisco.java.AnnotationMemberValuePair
> 	 * @generated
> 	 */
>-	public Adapter createMemberRefAdapter() {
>+	public Adapter createAnnotationMemberValuePairAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration Annotation Type Member Declaration}'.
>+	 * 
>+	 * 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.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration
>+	 * @generated
>+	 */
>+	public Adapter createAnnotationTypeMemberDeclarationAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BodyDeclaration Body Declaration}'.
>+	 * 
>+	 * 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.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.gmt.modisco.java.BodyDeclaration
>+	 * @generated
>+	 */
>+	public Adapter createBodyDeclarationAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ConstructorDeclaration Constructor Declaration}'.
>+	 * 
>+	 * 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.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.gmt.modisco.java.ConstructorDeclaration
>+	 * @generated
>+	 */
>+	public Adapter createConstructorDeclarationAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EnumConstantDeclaration Enum Constant Declaration}'.
>+	 * 
>+	 * 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.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.gmt.modisco.java.EnumConstantDeclaration
>+	 * @generated
>+	 */
>+	public Adapter createEnumConstantDeclarationAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.FieldDeclaration Field Declaration}'.
>+	 * 
>+	 * 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.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.gmt.modisco.java.FieldDeclaration
>+	 * @generated
>+	 */
>+	public Adapter createFieldDeclarationAdapter() {
>+		return null;
>+	}
>+
>+	/**
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Initializer Initializer}'.
>+	 * 
>+	 * 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.
>+	 * 
>+	 * @return the new adapter.
>+	 * @see org.eclipse.gmt.modisco.java.Initializer
>+	 * @generated
>+	 */
>+	public Adapter createInitializerAdapter() {
> 		return null;
> 	}
> 
>@@ -1475,898 +1461,898 @@
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MethodInvocation Method Invocation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SingleVariableDeclaration Single Variable Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.MethodInvocation
>+	 * @see org.eclipse.gmt.modisco.java.SingleVariableDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createMethodInvocationAdapter() {
>+	public Adapter createSingleVariableDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MethodRef Method Ref}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedAnnotationTypeMemberDeclaration Unresolved Annotation Type Member Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.MethodRef
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedAnnotationTypeMemberDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createMethodRefAdapter() {
>+	public Adapter createUnresolvedAnnotationTypeMemberDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MethodRefParameter Method Ref Parameter}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration Unresolved Method Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.MethodRefParameter
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createMethodRefParameterAdapter() {
>+	public Adapter createUnresolvedMethodDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Model Model}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedVariableDeclarationFragment Unresolved Variable Declaration Fragment}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Model
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedVariableDeclarationFragment
> 	 * @generated
> 	 */
>-	public Adapter createModelAdapter() {
>+	public Adapter createUnresolvedVariableDeclarationFragmentAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Modifier Modifier}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedSingleVariableDeclaration Unresolved Single Variable Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Modifier
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedSingleVariableDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createModifierAdapter() {
>+	public Adapter createUnresolvedSingleVariableDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NamedElement Named Element}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclaration Variable Declaration}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.NamedElement
>+	 * @see org.eclipse.gmt.modisco.java.VariableDeclaration
> 	 * @generated
> 	 */
>-	public Adapter createNamedElementAdapter() {
>+	public Adapter createVariableDeclarationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NumberLiteral Number Literal}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclarationFragment Variable Declaration Fragment}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.NumberLiteral
>+	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationFragment
> 	 * @generated
> 	 */
>-	public Adapter createNumberLiteralAdapter() {
>+	public Adapter createVariableDeclarationFragmentAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NullLiteral Null Literal}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AbstractTypeQualifiedExpression Abstract Type Qualified Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.NullLiteral
>+	 * @see org.eclipse.gmt.modisco.java.AbstractTypeQualifiedExpression
> 	 * @generated
> 	 */
>-	public Adapter createNullLiteralAdapter() {
>+	public Adapter createAbstractTypeQualifiedExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Package Package}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Annotation Annotation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Package
>+	 * @see org.eclipse.gmt.modisco.java.Annotation
> 	 * @generated
> 	 */
>-	public Adapter createPackageAdapter() {
>+	public Adapter createAnnotationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PackageAccess Package Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Archive Archive}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PackageAccess
>+	 * @see org.eclipse.gmt.modisco.java.Archive
> 	 * @generated
> 	 */
>-	public Adapter createPackageAccessAdapter() {
>+	public Adapter createArchiveAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ParameterizedType Parameterized Type}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayAccess Array Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ParameterizedType
>+	 * @see org.eclipse.gmt.modisco.java.ArrayAccess
> 	 * @generated
> 	 */
>-	public Adapter createParameterizedTypeAdapter() {
>+	public Adapter createArrayAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ParenthesizedExpression Parenthesized Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayCreation Array Creation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ParenthesizedExpression
>+	 * @see org.eclipse.gmt.modisco.java.ArrayCreation
> 	 * @generated
> 	 */
>-	public Adapter createParenthesizedExpressionAdapter() {
>+	public Adapter createArrayCreationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PostfixExpression Postfix Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayInitializer Array Initializer}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PostfixExpression
>+	 * @see org.eclipse.gmt.modisco.java.ArrayInitializer
> 	 * @generated
> 	 */
>-	public Adapter createPostfixExpressionAdapter() {
>+	public Adapter createArrayInitializerAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrefixExpression Prefix Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ArrayLengthAccess Array Length Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrefixExpression
>+	 * @see org.eclipse.gmt.modisco.java.ArrayLengthAccess
> 	 * @generated
> 	 */
>-	public Adapter createPrefixExpressionAdapter() {
>+	public Adapter createArrayLengthAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveType Primitive Type}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Assignment Assignment}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveType
>+	 * @see org.eclipse.gmt.modisco.java.Assignment
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeAdapter() {
>+	public Adapter createAssignmentAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeBoolean Primitive Type Boolean}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BooleanLiteral Boolean Literal}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeBoolean
>+	 * @see org.eclipse.gmt.modisco.java.BooleanLiteral
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeBooleanAdapter() {
>+	public Adapter createBooleanLiteralAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeByte Primitive Type Byte}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CastExpression Cast Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeByte
>+	 * @see org.eclipse.gmt.modisco.java.CastExpression
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeByteAdapter() {
>+	public Adapter createCastExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeChar Primitive Type Char}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CharacterLiteral Character Literal}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeChar
>+	 * @see org.eclipse.gmt.modisco.java.CharacterLiteral
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeCharAdapter() {
>+	public Adapter createCharacterLiteralAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeDouble Primitive Type Double}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ClassFile Class File}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeDouble
>+	 * @see org.eclipse.gmt.modisco.java.ClassFile
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeDoubleAdapter() {
>+	public Adapter createClassFileAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeShort Primitive Type Short}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ClassInstanceCreation Class Instance Creation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeShort
>+	 * @see org.eclipse.gmt.modisco.java.ClassInstanceCreation
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeShortAdapter() {
>+	public Adapter createClassInstanceCreationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeFloat Primitive Type Float}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ConditionalExpression Conditional Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeFloat
>+	 * @see org.eclipse.gmt.modisco.java.ConditionalExpression
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeFloatAdapter() {
>+	public Adapter createConditionalExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeInt Primitive Type Int}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Expression Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeInt
>+	 * @see org.eclipse.gmt.modisco.java.Expression
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeIntAdapter() {
>+	public Adapter createExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeLong Primitive Type Long}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.FieldAccess Field Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeLong
>+	 * @see org.eclipse.gmt.modisco.java.FieldAccess
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeLongAdapter() {
>+	public Adapter createFieldAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrimitiveTypeVoid Primitive Type Void}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.InfixExpression Infix Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.PrimitiveTypeVoid
>+	 * @see org.eclipse.gmt.modisco.java.InfixExpression
> 	 * @generated
> 	 */
>-	public Adapter createPrimitiveTypeVoidAdapter() {
>+	public Adapter createInfixExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ReturnStatement Return Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.InstanceofExpression Instanceof Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ReturnStatement
>+	 * @see org.eclipse.gmt.modisco.java.InstanceofExpression
> 	 * @generated
> 	 */
>-	public Adapter createReturnStatementAdapter() {
>+	public Adapter createInstanceofExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SingleVariableAccess Single Variable Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.MethodInvocation Method Invocation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SingleVariableAccess
>+	 * @see org.eclipse.gmt.modisco.java.MethodInvocation
> 	 * @generated
> 	 */
>-	public Adapter createSingleVariableAccessAdapter() {
>+	public Adapter createMethodInvocationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SingleVariableDeclaration Single Variable Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NumberLiteral Number Literal}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SingleVariableDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.NumberLiteral
> 	 * @generated
> 	 */
>-	public Adapter createSingleVariableDeclarationAdapter() {
>+	public Adapter createNumberLiteralAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Statement Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.NullLiteral Null Literal}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Statement
>+	 * @see org.eclipse.gmt.modisco.java.NullLiteral
> 	 * @generated
> 	 */
>-	public Adapter createStatementAdapter() {
>+	public Adapter createNullLiteralAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.StringLiteral String Literal}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ParenthesizedExpression Parenthesized Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.StringLiteral
>+	 * @see org.eclipse.gmt.modisco.java.ParenthesizedExpression
> 	 * @generated
> 	 */
>-	public Adapter createStringLiteralAdapter() {
>+	public Adapter createParenthesizedExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SuperConstructorInvocation Super Constructor Invocation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PostfixExpression Postfix Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SuperConstructorInvocation
>+	 * @see org.eclipse.gmt.modisco.java.PostfixExpression
> 	 * @generated
> 	 */
>-	public Adapter createSuperConstructorInvocationAdapter() {
>+	public Adapter createPostfixExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SuperFieldAccess Super Field Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PrefixExpression Prefix Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SuperFieldAccess
>+	 * @see org.eclipse.gmt.modisco.java.PrefixExpression
> 	 * @generated
> 	 */
>-	public Adapter createSuperFieldAccessAdapter() {
>+	public Adapter createPrefixExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SuperMethodInvocation Super Method Invocation}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.PackageAccess Package Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SuperMethodInvocation
>+	 * @see org.eclipse.gmt.modisco.java.PackageAccess
> 	 * @generated
> 	 */
>-	public Adapter createSuperMethodInvocationAdapter() {
>+	public Adapter createPackageAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SwitchCase Switch Case}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SingleVariableAccess Single Variable Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SwitchCase
>+	 * @see org.eclipse.gmt.modisco.java.SingleVariableAccess
> 	 * @generated
> 	 */
>-	public Adapter createSwitchCaseAdapter() {
>+	public Adapter createSingleVariableAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SwitchStatement Switch Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.StringLiteral String Literal}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SwitchStatement
>+	 * @see org.eclipse.gmt.modisco.java.StringLiteral
> 	 * @generated
> 	 */
>-	public Adapter createSwitchStatementAdapter() {
>+	public Adapter createStringLiteralAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SynchronizedStatement Synchronized Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SuperFieldAccess Super Field Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.SynchronizedStatement
>+	 * @see org.eclipse.gmt.modisco.java.SuperFieldAccess
> 	 * @generated
> 	 */
>-	public Adapter createSynchronizedStatementAdapter() {
>+	public Adapter createSuperFieldAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TagElement Tag Element}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SuperMethodInvocation Super Method Invocation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TagElement
>+	 * @see org.eclipse.gmt.modisco.java.SuperMethodInvocation
> 	 * @generated
> 	 */
>-	public Adapter createTagElementAdapter() {
>+	public Adapter createSuperMethodInvocationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TextElement Text Element}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ThisExpression This Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TextElement
>+	 * @see org.eclipse.gmt.modisco.java.ThisExpression
> 	 * @generated
> 	 */
>-	public Adapter createTextElementAdapter() {
>+	public Adapter createThisExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ThisExpression This Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeLiteral Type Literal}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ThisExpression
>+	 * @see org.eclipse.gmt.modisco.java.TypeLiteral
> 	 * @generated
> 	 */
>-	public Adapter createThisExpressionAdapter() {
>+	public Adapter createTypeLiteralAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ThrowStatement Throw Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeAccess Type Access}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.ThrowStatement
>+	 * @see org.eclipse.gmt.modisco.java.TypeAccess
> 	 * @generated
> 	 */
>-	public Adapter createThrowStatementAdapter() {
>+	public Adapter createTypeAccessAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TryStatement Try Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclarationExpression Variable Declaration Expression}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TryStatement
>+	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationExpression
> 	 * @generated
> 	 */
>-	public Adapter createTryStatementAdapter() {
>+	public Adapter createVariableDeclarationExpressionAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Type Type}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.AssertStatement Assert Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.Type
>+	 * @see org.eclipse.gmt.modisco.java.AssertStatement
> 	 * @generated
> 	 */
>-	public Adapter createTypeAdapter() {
>+	public Adapter createAssertStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeAccess Type Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Block Block}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TypeAccess
>+	 * @see org.eclipse.gmt.modisco.java.Block
> 	 * @generated
> 	 */
>-	public Adapter createTypeAccessAdapter() {
>+	public Adapter createBlockAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeDeclaration Type Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.BreakStatement Break Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TypeDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.BreakStatement
> 	 * @generated
> 	 */
>-	public Adapter createTypeDeclarationAdapter() {
>+	public Adapter createBreakStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeDeclarationStatement Type Declaration Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.CatchClause Catch Clause}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TypeDeclarationStatement
>+	 * @see org.eclipse.gmt.modisco.java.CatchClause
> 	 * @generated
> 	 */
>-	public Adapter createTypeDeclarationStatementAdapter() {
>+	public Adapter createCatchClauseAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeLiteral Type Literal}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ConstructorInvocation Constructor Invocation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TypeLiteral
>+	 * @see org.eclipse.gmt.modisco.java.ConstructorInvocation
> 	 * @generated
> 	 */
>-	public Adapter createTypeLiteralAdapter() {
>+	public Adapter createConstructorInvocationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeParameter Type Parameter}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ContinueStatement Continue Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.TypeParameter
>+	 * @see org.eclipse.gmt.modisco.java.ContinueStatement
> 	 * @generated
> 	 */
>-	public Adapter createTypeParameterAdapter() {
>+	public Adapter createContinueStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedItem Unresolved Item}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.DoStatement Do Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedItem
>+	 * @see org.eclipse.gmt.modisco.java.DoStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedItemAdapter() {
>+	public Adapter createDoStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedItemAccess Unresolved Item Access}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EmptyStatement Empty Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedItemAccess
>+	 * @see org.eclipse.gmt.modisco.java.EmptyStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedItemAccessAdapter() {
>+	public Adapter createEmptyStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedAnnotationDeclaration Unresolved Annotation Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.EnhancedForStatement Enhanced For Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedAnnotationDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.EnhancedForStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedAnnotationDeclarationAdapter() {
>+	public Adapter createEnhancedForStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedAnnotationTypeMemberDeclaration Unresolved Annotation Type Member Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ExpressionStatement Expression Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedAnnotationTypeMemberDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.ExpressionStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedAnnotationTypeMemberDeclarationAdapter() {
>+	public Adapter createExpressionStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedClassDeclaration Unresolved Class Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ForStatement For Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedClassDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.ForStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedClassDeclarationAdapter() {
>+	public Adapter createForStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedEnumDeclaration Unresolved Enum Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.IfStatement If Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedEnumDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.IfStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedEnumDeclarationAdapter() {
>+	public Adapter createIfStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedInterfaceDeclaration Unresolved Interface Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.LabeledStatement Labeled Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedInterfaceDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.LabeledStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedInterfaceDeclarationAdapter() {
>+	public Adapter createLabeledStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedLabeledStatement Unresolved Labeled Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ReturnStatement Return Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedLabeledStatement
>+	 * @see org.eclipse.gmt.modisco.java.ReturnStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedLabeledStatementAdapter() {
>+	public Adapter createReturnStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration Unresolved Method Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.Statement Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.Statement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedMethodDeclarationAdapter() {
>+	public Adapter createStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedSingleVariableDeclaration Unresolved Single Variable Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SuperConstructorInvocation Super Constructor Invocation}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedSingleVariableDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.SuperConstructorInvocation
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedSingleVariableDeclarationAdapter() {
>+	public Adapter createSuperConstructorInvocationAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedType Unresolved Type}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SwitchCase Switch Case}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedType
>+	 * @see org.eclipse.gmt.modisco.java.SwitchCase
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedTypeAdapter() {
>+	public Adapter createSwitchCaseAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedTypeDeclaration Unresolved Type Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SwitchStatement Switch Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedTypeDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.SwitchStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedTypeDeclarationAdapter() {
>+	public Adapter createSwitchStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedVariableDeclarationFragment Unresolved Variable Declaration Fragment}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.SynchronizedStatement Synchronized Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.UnresolvedVariableDeclarationFragment
>+	 * @see org.eclipse.gmt.modisco.java.SynchronizedStatement
> 	 * @generated
> 	 */
>-	public Adapter createUnresolvedVariableDeclarationFragmentAdapter() {
>+	public Adapter createSynchronizedStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclaration Variable Declaration}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.ThrowStatement Throw Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.VariableDeclaration
>+	 * @see org.eclipse.gmt.modisco.java.ThrowStatement
> 	 * @generated
> 	 */
>-	public Adapter createVariableDeclarationAdapter() {
>+	public Adapter createThrowStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclarationExpression Variable Declaration Expression}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TypeDeclarationStatement Type Declaration Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationExpression
>+	 * @see org.eclipse.gmt.modisco.java.TypeDeclarationStatement
> 	 * @generated
> 	 */
>-	public Adapter createVariableDeclarationExpressionAdapter() {
>+	public Adapter createTypeDeclarationStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclarationFragment Variable Declaration Fragment}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.TryStatement Try Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationFragment
>+	 * @see org.eclipse.gmt.modisco.java.TryStatement
> 	 * @generated
> 	 */
>-	public Adapter createVariableDeclarationFragmentAdapter() {
>+	public Adapter createTryStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclarationStatement Variable Declaration Statement}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.UnresolvedLabeledStatement Unresolved Labeled Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationStatement
>+	 * @see org.eclipse.gmt.modisco.java.UnresolvedLabeledStatement
> 	 * @generated
> 	 */
>-	public Adapter createVariableDeclarationStatementAdapter() {
>+	public Adapter createUnresolvedLabeledStatementAdapter() {
> 		return null;
> 	}
> 
> 	/**
>-	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.WildCardType Wild Card Type}'.
>+	 * Creates a new adapter for an object of class '{@link org.eclipse.gmt.modisco.java.VariableDeclarationStatement Variable Declaration Statement}'.
> 	 * 
> 	 * 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.
> 	 * 
> 	 * @return the new adapter.
>-	 * @see org.eclipse.gmt.modisco.java.WildCardType
>+	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationStatement
> 	 * @generated
> 	 */
>-	public Adapter createWildCardTypeAdapter() {
>+	public Adapter createVariableDeclarationStatementAdapter() {
> 		return null;
> 	}
> 
>Index: src/org/eclipse/gmt/modisco/java/emf/util/JavaUtil.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/util/JavaUtil.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/util/JavaUtil.java	(working copy)
>@@ -19,20 +19,28 @@
> */
> package org.eclipse.gmt.modisco.java.emf.util;
> 
>+import java.util.ArrayList;
> import java.util.HashMap;
> import java.util.Iterator;
>+import java.util.List;
> import java.util.Map;
> 
> import org.eclipse.core.runtime.IStatus;
> import org.eclipse.core.runtime.Platform;
> import org.eclipse.core.runtime.Status;
> import org.eclipse.emf.ecore.EObject;
>+import org.eclipse.gmt.modisco.common.core.logging.MoDiscoLogger;
>+import org.eclipse.gmt.modisco.java.ASTNode;
> import org.eclipse.gmt.modisco.java.AbstractMethodDeclaration;
> import org.eclipse.gmt.modisco.java.AbstractTypeDeclaration;
>+import org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration;
> import org.eclipse.gmt.modisco.java.AnonymousClassDeclaration;
> import org.eclipse.gmt.modisco.java.ArrayType;
> import org.eclipse.gmt.modisco.java.BodyDeclaration;
>+import org.eclipse.gmt.modisco.java.EnumConstantDeclaration;
>+import org.eclipse.gmt.modisco.java.EnumDeclaration;
> import org.eclipse.gmt.modisco.java.FieldDeclaration;
>+import org.eclipse.gmt.modisco.java.Initializer;
> import org.eclipse.gmt.modisco.java.Model;
> import org.eclipse.gmt.modisco.java.NamedElement;
> import org.eclipse.gmt.modisco.java.Package;
>@@ -50,224 +58,191 @@
> * An utility class for computing a qualified name for some model elements.
> * 
> */
>-public final class JavaUtil {
>-	private static final String TRACEID_GETQNAME = "org.eclipse.gmt.modisco.java/debug/JavaUtil/getQualifiedNames";
>+public class JavaUtil {
>+
>+	private static final String TRACEID_GETQNAME = "org.eclipse.gmt.modisco.java/debug/JavaUtil/getQualifiedNames"; //$NON-NLS-1$
> 	private static final boolean TRACE_GETQNAME = JavaPlugin.getDefault()
> 			.isDebugging()
> 			&& new Boolean(Platform.getDebugOption(TRACEID_GETQNAME));
>-	private static final String TRACEID_NE_BY_QN = "org.eclipse.gmt.modisco.java/debug/JavaUtil/getNamedElementByQualifiedName";
>+	private static final String TRACEID_NE_BY_QN = "org.eclipse.gmt.modisco.java/debug/JavaUtil/getNamedElementByQualifiedName"; //$NON-NLS-1$
> 	private static final boolean TRACE_NE_BY_QN = JavaPlugin.getDefault()
> 			.isDebugging()
> 			&& new Boolean(Platform.getDebugOption(TRACEID_NE_BY_QN));
>-
>-	private JavaUtil() {
>+	
>+	/**
>+	 * Convenience method for {@code getQualifiedName(object, true)}.
>+	 * @see #getQualifiedName(ASTNode, boolean)
>+	 */
>+	public static String getQualifiedName(ASTNode object) {
>+		return getQualifiedName(object, true);
> 	}
>-
>+	
> 	/**
> 	 * Computes a qualified name for named elements (types, methods, parameters,
> 	 * ...).
> 	 * 
> 	 * @param object
> 	 * a model element.
>-	 * @return the qualified name or null if the object type is not a named
>-	 * type.
>+	 * @param removeGenerics
>+	 * 			 if we have to remove the generics.
>+	 * @return the qualified name or {@code null} if the object type is not a
>+	 * named type.
> 	 */
>-	public static String getQualifiedName(EObject object) {
>-		StringBuffer qualifiedNameSB = new StringBuffer();
>-		if (object instanceof VariableDeclarationFragment) {
>+	public static String getQualifiedName(ASTNode object, boolean removeGenerics) {
>+		StringBuilder buffer = new StringBuilder();
>+		if (object instanceof AnnotationTypeMemberDeclaration) {
>+			String containerQName = getQualifiedName((ASTNode) object
>+					.eContainer(), removeGenerics);
>+			buffer.append(containerQName);
>+			buffer.append("."); //$NON-NLS-1$
>+			buffer.append(((AnnotationTypeMemberDeclaration) object).getName());
>+			buffer.append("()"); //$NON-NLS-1$
>+		} else if (object instanceof EnumConstantDeclaration) {
>+			String containerQName = getQualifiedName((ASTNode) object
>+					.eContainer(), removeGenerics);
>+			buffer.append(containerQName);
>+			buffer.append("."); //$NON-NLS-1$
>+			buffer.append(((EnumConstantDeclaration) object).getName());
>+		} else if (object instanceof VariableDeclarationFragment) {
> 			if (object.eContainer() instanceof FieldDeclaration) {
>-				VariableDeclarationFragment singleVariableDeclaration = 
>-					(VariableDeclarationFragment) object;
>-				String containerQN = getQualifiedName(singleVariableDeclaration
>-						.eContainer().eContainer());
>-				qualifiedNameSB.append(containerQN);
>-				qualifiedNameSB.append(".");
>-				qualifiedNameSB.append(singleVariableDeclaration.getName());
>-			} else {
>-				// Empty qualified name from a VaraibleDeclarationStatement or
>-				// VariableDeclarationExpression
>+				VariableDeclarationFragment singleVariableDeclaration = (VariableDeclarationFragment) object;
>+				String containerQN = getQualifiedName((ASTNode) singleVariableDeclaration
>+						.eContainer().eContainer(), removeGenerics);
>+				buffer.append(containerQN);
>+				buffer.append("."); //$NON-NLS-1$
>+				buffer.append(singleVariableDeclaration.getName());
> 			}
> 		} else if (object instanceof AbstractMethodDeclaration) {
>-			AbstractMethodDeclaration methodDeclaration = 
>-				(AbstractMethodDeclaration) object;
>-			String containerQName = getQualifiedName(object.eContainer());
>-			qualifiedNameSB.append(containerQName);
>-			qualifiedNameSB.append('.');
>-			qualifiedNameSB.append(methodDeclaration.getName());
>-			if (methodDeclaration.getTypeParameters().size() > 0) {
>-				qualifiedNameSB.append('<');
>-				Iterator<TypeParameter> typeParameters = methodDeclaration
>-						.getTypeParameters().iterator();
>-				while (typeParameters.hasNext()) {
>-					TypeParameter typeParameter = (TypeParameter) typeParameters
>-							.next();
>-					qualifiedNameSB.append(typeParameter.getName());
>-					if (typeParameter.getBounds().size() > 0) {
>-						qualifiedNameSB.append(" extends ");
>-						Iterator<TypeAccess> typeAccessIterator = typeParameter
>-								.getBounds().iterator();
>-						boolean hasNext = typeAccessIterator.hasNext();
>-						while (hasNext) {
>-							TypeAccess typeAccess = 
>-								(TypeAccess) typeAccessIterator.next();
>-							qualifiedNameSB.append(JavaUtil
>-									.getQualifiedName(typeAccess.getType()));
>-							hasNext = typeAccessIterator.hasNext();
>-							if (hasNext) {
>-								qualifiedNameSB.append(',');
>-							}
>-						}
>-					}
>-					if (typeParameters.hasNext()) {
>-						qualifiedNameSB.append(',');
>-					}
>-				}
>-				qualifiedNameSB.append('>');
>-			}
>-			qualifiedNameSB.append('(');
>-			Iterator<SingleVariableDeclaration> parameters = methodDeclaration
>-					.getParameters().iterator();
>-			boolean asNext = parameters.hasNext();
>-			while (asNext) {
>-				SingleVariableDeclaration singleVariableDeclaration = 
>-					(SingleVariableDeclaration) parameters.next();
>-				String parameterTypeQN = getQualifiedName(
>-						singleVariableDeclaration.getType());
>-				qualifiedNameSB.append(parameterTypeQN);
>-				asNext = parameters.hasNext();
>-				if (asNext) {
>-					qualifiedNameSB.append(',');
>+			AbstractMethodDeclaration methodDeclaration = (AbstractMethodDeclaration) object;
>+			String containerQName = getQualifiedName((ASTNode) object.eContainer(), removeGenerics);
>+			buffer.append(containerQName);
>+			buffer.append('.');
>+			buffer.append(methodDeclaration.getName());
>+			buffer.append('(');
>+			for (int i = 0; i < methodDeclaration.getParameters().size(); i++) {
>+				if (i > 0) {
>+					buffer.append(","); //$NON-NLS-1$
> 				}
>+				SingleVariableDeclaration svd = methodDeclaration.getParameters().get(i);
>+				buffer.append(getQualifiedName(svd.getType(), true));
> 			}
>-			qualifiedNameSB.append(")");
>+			buffer.append(")"); //$NON-NLS-1$
> 		} else if (object instanceof ArrayType) {
> 			ArrayType arraytype = (ArrayType) object;
>-			qualifiedNameSB
>-					.append(getQualifiedName(arraytype.getElementType()));
>-			for (int i = 0; i < arraytype.getDimensions(); i++) {
>-				qualifiedNameSB.append("[]");
>-			}
>+			buffer.append(arraytype.getName());
> 		} else if (object instanceof TypeParameter) {
> 			TypeParameter typeParameter = (TypeParameter) object;
>-			qualifiedNameSB.append(typeParameter.getName());
>+			if(removeGenerics){
>+				if(typeParameter.getBounds().size() > 0) {
>+					//get the erasure
>+					buffer.append(getQualifiedName(typeParameter.getBounds().get(0), true));
>+				} else {
>+					buffer.append("java.lang.Object"); //$NON-NLS-1$
>+				}
>+			} else {
>+				buffer.append(typeParameter.getName());
>+			}
>+		} else if (object instanceof WildCardType) {
>+			WildCardType wildcardType = (WildCardType) object;
>+			buffer.append(wildcardType.getName());
> 		} else if (object instanceof ParameterizedType) {
> 			ParameterizedType parameterizedType = (ParameterizedType) object;
>-			qualifiedNameSB
>-					.append(getQualifiedName(parameterizedType.getType()));
>-			qualifiedNameSB.append('<');
>-			Iterator<TypeAccess> typeArguments = parameterizedType
>-					.getTypeArguments().iterator();
>-			boolean hasNext = typeArguments.hasNext();
>-			while (hasNext) {
>-				TypeAccess typeAccess = (TypeAccess) typeArguments.next();
>-				qualifiedNameSB.append(getQualifiedName(typeAccess.getType()));
>-				hasNext = typeArguments.hasNext();
>-				if (hasNext) {
>-					qualifiedNameSB.append(',');
>-				}
>+			if(removeGenerics) {
>+				buffer.append(getQualifiedName(parameterizedType.getType(), removeGenerics));
>+			} else {
>+				buffer.append(parameterizedType.getName());
> 			}
>-			qualifiedNameSB.append('>');
> 		} else if (object instanceof AbstractTypeDeclaration) {
> 			AbstractTypeDeclaration typeDeclaration = (AbstractTypeDeclaration) object;
> 			if (typeDeclaration.eContainer() instanceof AbstractTypeDeclaration) {
> 				AbstractTypeDeclaration superTypeDeclaration = (AbstractTypeDeclaration) typeDeclaration
> 						.eContainer();
>-				qualifiedNameSB.append(getQualifiedName(superTypeDeclaration));
>-				qualifiedNameSB.append('.');
>-			} else if (typeDeclaration.eContainer() instanceof org.eclipse.gmt.modisco.java.Package) {
>-				org.eclipse.gmt.modisco.java.Package package_ = 
>-					(org.eclipse.gmt.modisco.java.Package) typeDeclaration.eContainer();
>-				qualifiedNameSB.append(getQualifiedName(package_));
>-				qualifiedNameSB.append('.');
>+				buffer.append(getQualifiedName(superTypeDeclaration, removeGenerics));
>+				buffer.append('.');
>+			} else if (typeDeclaration.eContainer() instanceof Package) {
>+				Package package_ = (Package) typeDeclaration.eContainer();
>+				buffer.append(getQualifiedName(package_, removeGenerics));
>+				buffer.append('.');
> 			} else if (typeDeclaration.eContainer() instanceof Model) {
> 				// No prefix if container is a Model instance
> 			} else if (typeDeclaration.eContainer() != null) {
>-				IStatus status = new Status(Status.WARNING,
>-						JavaPlugin.PLUGIN_ID,
>-						"Not managed type declaration: typeDeclaration.eContainer().getClass()= "
>-								+ object.eContainer().getClass().getName());
>-				JavaPlugin.getDefault().getLog().log(status);
>+				MoDiscoLogger.logWarning(
>+						"Not managed type declaration: typeDeclaration.eContainer().getClass()= " //$NON-NLS-1$
>+						, JavaPlugin.getDefault());
> 			} else {
>-				IStatus status = new Status(Status.WARNING,
>-						JavaPlugin.PLUGIN_ID, "Type with null container");
>-				JavaPlugin.getDefault().getLog().log(status);
>+				MoDiscoLogger.logWarning("Type with null container" //$NON-NLS-1$
>+						, JavaPlugin.getDefault());
> 			}
>-			qualifiedNameSB.append(typeDeclaration.getName());
>+			buffer.append(typeDeclaration.getName());
> 		} else if (object instanceof Package) {
> 			Package package_ = (Package) object;
> 			if (package_.eContainer() instanceof Package) {
> 				Package superPackage = (Package) package_.eContainer();
>-				qualifiedNameSB.append(getQualifiedName(superPackage));
>-				qualifiedNameSB.append('.');
>+				buffer.append(getQualifiedName(superPackage, removeGenerics));
>+				buffer.append('.');
> 			}
>-			qualifiedNameSB.append(package_.getName());
>+			buffer.append(package_.getName());
> 		} else if (object instanceof TypeAccess) {
> 			TypeAccess typeAccess = (TypeAccess) object;
>-			qualifiedNameSB.append(getQualifiedName(typeAccess.getType()));
>+			buffer.append(getQualifiedName(typeAccess.getType(), removeGenerics));
> 		} else if (object instanceof Model) {
> 			Exception e = new Exception(
>-					"getQualified name should note be called with a model as parameter");
>-			IStatus status = new Status(Status.ERROR, JavaPlugin.PLUGIN_ID, e
>+					"getQualified name should note be called with a model as parameter"); //$NON-NLS-1$
>+			IStatus status = new Status(IStatus.ERROR, JavaPlugin.PLUGIN_ID, e
> 					.getMessage(), e);
> 			JavaPlugin.getDefault().getLog().log(status);
> 		} else if (object instanceof PrimitiveType) {
> 			PrimitiveType primitiveType = (PrimitiveType) object;
>-			qualifiedNameSB.append(primitiveType.getName());
>+			buffer.append(primitiveType.getName());
> 		} else if (object instanceof AnonymousClassDeclaration) {
> 			// No qualified name for AnonymousClassDeclaration
> 		} else if (object instanceof SingleVariableDeclaration) {
>-			SingleVariableDeclaration singleVariableDeclaration = 
>-				(SingleVariableDeclaration) object;
>-			qualifiedNameSB.append(getQualifiedName(singleVariableDeclaration
>-					.eContainer()));
>-			qualifiedNameSB.append('.');
>-			qualifiedNameSB.append(singleVariableDeclaration.getName());
>-		} else if (object instanceof WildCardType) {
>-			qualifiedNameSB.append('?');
>-			if (((WildCardType) object).getBound() != null) {
>-				if (((WildCardType) object).isUpperBound()) {
>-					qualifiedNameSB.append(" extends ");
>-				} else {
>-					qualifiedNameSB.append(" super ");
>-				}
>-				qualifiedNameSB.append(getQualifiedName(((WildCardType) object)
>-						.getBound()));
>-			}
>+			SingleVariableDeclaration singleVariableDeclaration = (SingleVariableDeclaration) object;
>+			buffer.append(getQualifiedName((ASTNode) singleVariableDeclaration
>+					.eContainer(), removeGenerics));
>+			buffer.append('.');
>+			buffer.append(singleVariableDeclaration.getName());
> 		} else if (object != null) {
>-			Exception e = new Exception("Not managed type: "
>+			Exception e = new Exception("Not managed type: " //$NON-NLS-1$
> 					+ object.getClass().getName());
>-			IStatus status = new Status(Status.ERROR, JavaPlugin.PLUGIN_ID, e
>+			IStatus status = new Status(IStatus.ERROR, JavaPlugin.PLUGIN_ID, e
> 					.getMessage(), e);
> 			JavaPlugin.getDefault().getLog().log(status);
> 		} else {
>-			Exception e = new Exception("Null paramter");
>-			IStatus status = new Status(Status.ERROR, JavaPlugin.PLUGIN_ID, e
>-					.getMessage(), e);
>-			JavaPlugin.getDefault().getLog().log(status);
>-			qualifiedNameSB.append("<<null>>");
>+			// May occur when parent model element is not complete (e.g. unresolved type of parameter of method)
>+//			Exception e = new Exception("Null parameter");
>+//			IStatus status = new Status(IStatus.ERROR, JavaPlugin.PLUGIN_ID, e
>+//					.getMessage(), e);
>+//			JavaPlugin.getDefault().getLog().log(status);
>+			buffer.append("<<null>>"); //$NON-NLS-1$
> 		}
> 		if (Platform.inDebugMode() && TRACE_GETQNAME) {
>-			System.out.println("JavaUtil.getQualifiedName(EObject)= "
>-					+ qualifiedNameSB.toString());
>+			System.out.println("JavaUtil.getQualifiedName(EObject)= " //$NON-NLS-1$
>+					+ buffer.toString());
> 		}
>-		return qualifiedNameSB.toString();
>+		return buffer.toString();
> 	}
> 
> 	private class CurrentElement {
> 
>-		private EObject element = null;
>+		private EObject currentElement = null;
>+		private List<EObject> element = new ArrayList<EObject>();
> 		private boolean hasChanged = false;
> 		private boolean hasChanged2 = true;
>+		private boolean init = true;
> 
> 		public void setElement(EObject element) {
>-			this.element = element;
>+			this.element.add(element);
>+			if (this.currentElement == null) {
>+				this.currentElement = element;
>+			}
> 			this.hasChanged = false;
> 			this.hasChanged2 = true;
> 		}
> 
> 		public boolean hasChanged() {
> 			if (this.hasChanged) {
>-				hasChanged = false;
>+				this.hasChanged = false;
> 				return true;
> 			} else {
> 				return false;
>@@ -276,7 +251,11 @@
> 
> 		public boolean hasChanged2() {
> 			if (this.hasChanged2) {
>-				hasChanged2 = false;
>+				this.hasChanged2 = false;
>+				if (this.element.size() > 0) {
>+					this.currentElement = this.element.get(0);
>+					this.element.remove(0);
>+				}
> 				return true;
> 			} else {
> 				return false;
>@@ -284,13 +263,32 @@
> 		}
> 
> 		public EObject getElement() {
>-			return this.element;
>+			return this.currentElement;
> 		}
> 
> 		public boolean isEmpty() {
>-			return this.element == null;
>+			return this.currentElement == null;
> 		}
> 
>+		public boolean nextIndex() {
>+			if (this.init) {
>+				this.init = false;
>+				return true;
>+			} else {
>+				this.hasChanged = false;
>+				this.hasChanged2 = true;
>+				return (this.element.size() > 0);
>+//				if (this.element.size() > 0) {
>+//				this.currentElement = this.element.get(0);
>+//				this.element.remove(0);
>+//					return true;
>+//				} else {
>+//					return false;
>+//				}
>+			}
>+
>+		}
>+
> 	}
> 
> 	/**
>@@ -320,7 +318,7 @@
> 			Map<String, NamedElement> targets) {
> 		if (TRACE_NE_BY_QN) {
> 			System.out
>-					.println("Begin getNamedElementByQualifiedName(Model, String): "
>+					.println("Begin getNamedElementByQualifiedName(Model, String): " //$NON-NLS-1$
> 							+ searchedQualifiedName);
> 		}
> 		NamedElement resultNamedElement = null;
>@@ -328,12 +326,10 @@
> 		CurrentElement currentElement = javaUtil.new CurrentElement();
> 		if (searchedQualifiedName == null) {
> 			resultNamedElement = null;
>-			IStatus status = new Status(
>-					IStatus.ERROR,
>-					JavaPlugin.PLUGIN_ID,
>-					"JavaDiscovererUtils::getNamedElementByQualifiedName(): qualifiedName parameter is null",
>-					new Exception());
>-			JavaPlugin.getDefault().getLog().log(status);
>+			MoDiscoLogger
>+					.logError(
>+							"JavaDiscovererUtils::getNamedElementByQualifiedName(): qualifiedName parameter is null", //$NON-NLS-1$
>+							JavaPlugin.getDefault());
> 		} else {
> 			Iterator<Type> orphanTypes = model.getOrphanTypes().iterator();
> 			while (orphanTypes.hasNext()) {
>@@ -343,174 +339,194 @@
> 				}
> 			}
> 			boolean end = false;
>-			while (resultNamedElement == null && !end
>-					&& currentElement.hasChanged2()) {
>-				try {
>-					if (currentElement.isEmpty()) {
>-						Iterator<Package> packages = model.getOwnedElements()
>-								.iterator();
>-						while (packages.hasNext() && resultNamedElement == null
>-								&& !currentElement.hasChanged()) {
>-							Package package_ = packages.next();
>-							if (searchedQualifiedName.startsWith(package_
>-									.getQualifiedName())) {
>-								if (searchedQualifiedName.equals(package_
>-										.getQualifiedName())) {
>-									resultNamedElement = package_;
>-								} else {
>-									currentElement.setElement(package_);
>-								}
>-							}
>-						}
>-					} else {
>-						if (currentElement.getElement() instanceof Package) {
>-							Package package_ = (Package) currentElement
>-									.getElement();
>-							Iterator<Package> packages = package_
>-									.getOwnedPackages().iterator();
>+			while (currentElement.nextIndex() && resultNamedElement == null) {
>+				while (resultNamedElement == null && !end
>+						&& currentElement.hasChanged2()) {
>+					try {
>+						if (currentElement.isEmpty()) {
>+							Iterator<Package> packages = model
>+									.getOwnedElements().iterator();
> 							while (packages.hasNext()
> 									&& resultNamedElement == null
>-									&& !currentElement.hasChanged()) {
>-								Package subpackage = packages.next();
>-								if (searchedQualifiedName.startsWith(subpackage
>-										.getQualifiedName())) {
>-									if (searchedQualifiedName.equals(subpackage
>-											.getQualifiedName())) {
>-										resultNamedElement = subpackage;
>-									} else {
>-										currentElement.setElement(subpackage);
>-									}
>-								}
>-							}
>-							Iterator<AbstractTypeDeclaration> abstractTypeDeclarations = package_
>-									.getOwnedElements().iterator();
>-							while (abstractTypeDeclarations.hasNext()
>-									&& (resultNamedElement == null)
>-									&& (!currentElement.hasChanged())) {
>-								AbstractTypeDeclaration abstractTypeDeclaration = abstractTypeDeclarations
>-										.next();
>-								boolean startWithsearchedQN;
>-								try {
>-									startWithsearchedQN = searchedQualifiedName
>-											.startsWith(abstractTypeDeclaration
>-													.getQualifiedName());
>-								} catch (Exception e) {
>-									RuntimeException re = new RuntimeException(
>-											"Failed: searchedQualifiedName="
>-													+ searchedQualifiedName
>-													+ " package_="
>-													+ package_
>-															.getQualifiedName(),
>-											e);
>-									throw re;
>-								}
>-								if (startWithsearchedQN) {
>+									/*&& !currentElement.hasChanged()*/) {
>+								Package package_ = packages.next();
>+								String currentPackageName = JavaUtil
>+										.getQualifiedName(package_, false);
>+								if (searchedQualifiedName
>+										.startsWith(currentPackageName)) {
> 									if (searchedQualifiedName
>-											.equals(abstractTypeDeclaration
>-													.getQualifiedName())) {
>-										resultNamedElement = abstractTypeDeclaration;
>+											.equals(currentPackageName)) {
>+										resultNamedElement = package_;
> 									} else {
>-										currentElement
>-												.setElement(abstractTypeDeclaration);
>+										currentElement.setElement(package_);
> 									}
> 								}
> 							}
>-						} else if (currentElement.getElement() instanceof AbstractTypeDeclaration) {
>-							AbstractTypeDeclaration abstractTypeDeclaration = (AbstractTypeDeclaration) currentElement
>-									.getElement();
>-							Iterator<BodyDeclaration> bodyDeclarations = abstractTypeDeclaration
>-									.getBodyDeclarations().iterator();
>-							while (bodyDeclarations.hasNext()
>-									&& resultNamedElement == null
>-									&& !currentElement.hasChanged()) {
>-								BodyDeclaration bodyDeclaration = bodyDeclarations
>-										.next();
>-								if (bodyDeclaration instanceof AbstractTypeDeclaration) {
>-									AbstractTypeDeclaration subAbstractTypeDeclaration = (AbstractTypeDeclaration) bodyDeclaration;
>-									String subAbstractTypeDeclarationQN = subAbstractTypeDeclaration
>-											.getQualifiedName();
>+						} else {
>+							if (currentElement.getElement() instanceof Package) {
>+								Package package_ = (Package) currentElement
>+										.getElement();
>+								Iterator<Package> packages = package_
>+										.getOwnedPackages().iterator();
>+								while (packages.hasNext()
>+										&& resultNamedElement == null
>+										/*&& !currentElement.hasChanged()*/) {
>+									Package subpackage = packages.next();
>+									String subPackageName = JavaUtil
>+											.getQualifiedName(subpackage, false);
> 									if (searchedQualifiedName
>-											.startsWith(subAbstractTypeDeclarationQN)) {
>+											.startsWith(subPackageName)) {
> 										if (searchedQualifiedName
>-												.equals(subAbstractTypeDeclarationQN)) {
>-											resultNamedElement = subAbstractTypeDeclaration;
>+												.equals(subPackageName)) {
>+											resultNamedElement = subpackage;
> 										} else {
> 											currentElement
>-													.setElement(subAbstractTypeDeclaration);
>+													.setElement(subpackage);
> 										}
> 									}
>-								} else if (!targets
>-										.containsValue(bodyDeclaration)) {
>-									if (bodyDeclaration instanceof AbstractMethodDeclaration) {
>-										AbstractMethodDeclaration abstractMethodDeclaration = (AbstractMethodDeclaration) bodyDeclaration;
>-										String abstractMethodDeclarationQN = JavaUtil
>-												.getQualifiedName(abstractMethodDeclaration);
>-										if (abstractMethodDeclarationQN
>-												.contains("<<null>>")) {
>-											IStatus status = new Status(
>-													IStatus.WARNING,
>-													JavaPlugin.PLUGIN_ID,
>-													"Failed to compute qualifiedName:"
>-															+ abstractMethodDeclarationQN
>-															+ " ; searchedQualifiedName= "
>-															+ searchedQualifiedName,
>-													new Exception());
>-											JavaPlugin.getDefault().getLog()
>-													.log(status);
>+								}
>+								Iterator<AbstractTypeDeclaration> abstractTypeDeclarations = package_
>+										.getOwnedElements().iterator();
>+								while (abstractTypeDeclarations.hasNext()
>+										&& (resultNamedElement == null)
>+										/*&& (!currentElement.hasChanged())*/) {
>+									AbstractTypeDeclaration atd = abstractTypeDeclarations
>+											.next();
>+									String atdName = JavaUtil
>+											.getQualifiedName(atd, false);
>+									if (searchedQualifiedName
>+											.startsWith(atdName)) {
>+										if (searchedQualifiedName
>+												.equals(atdName)) {
>+											resultNamedElement = atd;
>+										} else {
>+											currentElement.setElement(atd);
> 										}
>+									}
>+								}
>+							} else if (currentElement.getElement() instanceof AbstractTypeDeclaration) {
>+								AbstractTypeDeclaration abstractTypeDeclaration = (AbstractTypeDeclaration) currentElement
>+										.getElement();
>+								List<BodyDeclaration> bodyDeclarations = abstractTypeDeclaration
>+										.getBodyDeclarations();
>+								// for enums, we have to retrieve enums
>+								// constants
>+								if (abstractTypeDeclaration instanceof EnumDeclaration) {
>+									bodyDeclarations
>+											.addAll(((EnumDeclaration) abstractTypeDeclaration)
>+													.getEnumConstants());
>+								}
>+								Iterator<BodyDeclaration> it = bodyDeclarations
>+										.iterator();
>+								while (it.hasNext()
>+										&& resultNamedElement == null
>+										/*&& !currentElement.hasChanged()*/) {
>+									BodyDeclaration bodyDeclaration = it.next();
>+									if (bodyDeclaration instanceof AbstractTypeDeclaration) {
>+										AbstractTypeDeclaration subAbstractTypeDeclaration = (AbstractTypeDeclaration) bodyDeclaration;
>+										String subATDQN = JavaUtil
>+												.getQualifiedName(subAbstractTypeDeclaration, false);
> 										if (searchedQualifiedName
>-												.equals(abstractMethodDeclarationQN)) {
>+												.startsWith(subATDQN)) {
> 											if (searchedQualifiedName
>-													.equals(abstractMethodDeclarationQN)) {
>-												resultNamedElement = abstractMethodDeclaration;
>+													.equals(subATDQN)) {
>+												resultNamedElement = subAbstractTypeDeclaration;
> 											} else {
> 												currentElement
>-														.setElement(abstractMethodDeclaration);
>+														.setElement(subAbstractTypeDeclaration);
> 											}
> 										}
>-									} else if (bodyDeclaration instanceof FieldDeclaration) {
>-										FieldDeclaration fieldDeclaration = (FieldDeclaration) bodyDeclaration;
>-										Iterator<VariableDeclarationFragment> variableDeclarationFragments = fieldDeclaration
>-												.getFragments().iterator();
>-										while (variableDeclarationFragments
>-												.hasNext()) {
>-											VariableDeclarationFragment variableDeclarationFragment = variableDeclarationFragments
>-													.next();
>-											String variableDeclarationFragmentQN = JavaUtil
>-													.getQualifiedName(variableDeclarationFragment);
>+									} else if (!targets
>+											.containsValue(bodyDeclaration)) {
>+										if (bodyDeclaration instanceof AbstractMethodDeclaration) {
>+											AbstractMethodDeclaration abstractMethodDeclaration = (AbstractMethodDeclaration) bodyDeclaration;
>+											String amdQN = JavaUtil
>+													.getQualifiedName(abstractMethodDeclaration, true);
>+											if (amdQN.contains("<<null>>")) { //$NON-NLS-1$
>+												IStatus status = new Status(
>+														IStatus.WARNING,
>+														JavaPlugin.PLUGIN_ID,
>+														"Failed to compute qualifiedName:" //$NON-NLS-1$
>+																+ amdQN
>+																+ " ; searchedQualifiedName= " //$NON-NLS-1$
>+																+ searchedQualifiedName,
>+														new Exception());
>+												JavaPlugin.getDefault()
>+														.getLog().log(status);
>+											}
> 											if (searchedQualifiedName
>-													.equals(variableDeclarationFragmentQN)) {
>-												resultNamedElement = variableDeclarationFragment;
>+													.startsWith(amdQN)) {
>+												if (searchedQualifiedName
>+														.equals(amdQN)) {
>+													resultNamedElement = abstractMethodDeclaration;
>+												} else {
>+													currentElement
>+															.setElement(abstractMethodDeclaration);
>+												}
> 											}
>+										} else if (bodyDeclaration instanceof FieldDeclaration) {
>+											FieldDeclaration fieldDeclaration = (FieldDeclaration) bodyDeclaration;
>+											Iterator<VariableDeclarationFragment> variableDeclarationFragments = fieldDeclaration
>+													.getFragments().iterator();
>+											while (variableDeclarationFragments
>+													.hasNext()) {
>+												VariableDeclarationFragment variableDeclarationFragment = variableDeclarationFragments
>+														.next();
>+												String variableDeclarationFragmentQN = JavaUtil
>+														.getQualifiedName(variableDeclarationFragment, false);
>+												if (searchedQualifiedName
>+														.equals(variableDeclarationFragmentQN)) {
>+													resultNamedElement = variableDeclarationFragment;
>+												}
>+											}
>+										} else if (bodyDeclaration instanceof EnumConstantDeclaration) {
>+											EnumConstantDeclaration enumConstantDeclaration = (EnumConstantDeclaration) bodyDeclaration;
>+											String enumConstantQN = JavaUtil
>+													.getQualifiedName(enumConstantDeclaration, false);
>+											if (searchedQualifiedName
>+													.equals(enumConstantQN)) {
>+												resultNamedElement = enumConstantDeclaration;
>+											}
>+										} else if (bodyDeclaration instanceof AnnotationTypeMemberDeclaration) {
>+											AnnotationTypeMemberDeclaration annoMemberDeclaration = (AnnotationTypeMemberDeclaration) bodyDeclaration;
>+											String enumConstantQN = JavaUtil
>+													.getQualifiedName(annoMemberDeclaration, false);
>+											if (searchedQualifiedName
>+													.equals(enumConstantQN)) {
>+												resultNamedElement = annoMemberDeclaration;
>+											}
>+										} else if (bodyDeclaration instanceof Initializer) {
>+											// Nothing to do
>+										} else {
>+											throw new RuntimeException(
>+													"Unexpected type in an AbstractTypeDeclaration contaiment: " //$NON-NLS-1$
>+															+ bodyDeclaration
>+																	.getClass()
>+																	.getName());
> 										}
>-									} else {
>-										throw new RuntimeException(
>-												"Unexpected type in an AbstractTypeDeclaration contaiment: "
>-														+ bodyDeclaration
>-																.getClass()
>-																.getName());
> 									}
> 								}
>+							} else {
>+								end = true;
> 							}
>-						} else {
>-							end = true;
> 						}
>+					} catch (Exception e) {
>+						RuntimeException runtimeException = new RuntimeException(
>+								"getNamedElementByQualifiedName failed while reading:" //$NON-NLS-1$
>+										+ JavaUtil
>+												.getQualifiedName((ASTNode) currentElement
>+														.getElement(), false), e);
>+						IStatus status = new Status(IStatus.ERROR,
>+								JavaPlugin.PLUGIN_ID, runtimeException
>+										.getMessage(), runtimeException);
>+						JavaPlugin.getDefault().getLog().log(status);
>+						throw runtimeException;
> 					}
>-				} catch (Exception e) {
>-					RuntimeException runtimeException = new RuntimeException(
>-							"getNamedElementByQualifiedName failed while reading:"
>-									+ JavaUtil.getQualifiedName(currentElement
>-											.getElement()), e);
>-					IStatus status = new Status(IStatus.ERROR,
>-							JavaPlugin.PLUGIN_ID,
>-							runtimeException.getMessage(), runtimeException);
>-					JavaPlugin.getDefault().getLog().log(status);
>-					throw runtimeException;
> 				}
> 			}
> 			if (TRACE_NE_BY_QN) {
> 				System.out
>-						.println("End getNamedElementByQualifiedName(Model, String): result="
>+						.println("End getNamedElementByQualifiedName(Model, String): result=" //$NON-NLS-1$
> 								+ resultNamedElement);
> 			}
> 		}
>Index: src/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java	(working copy)
>@@ -23,127 +23,7 @@
> 
> import org.eclipse.emf.ecore.EClass;
> import org.eclipse.emf.ecore.EObject;
>-
>-import org.eclipse.gmt.modisco.java.ASTNode;
>-import org.eclipse.gmt.modisco.java.AbstractMethodDeclaration;
>-import org.eclipse.gmt.modisco.java.AbstractMethodInvocation;
>-import org.eclipse.gmt.modisco.java.AbstractTypeDeclaration;
>-import org.eclipse.gmt.modisco.java.AbstractTypeQualifiedExpression;
>-import org.eclipse.gmt.modisco.java.AbstractVariablesContainer;
>-import org.eclipse.gmt.modisco.java.Annotation;
>-import org.eclipse.gmt.modisco.java.AnnotationMemberValuePair;
>-import org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration;
>-import org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration;
>-import org.eclipse.gmt.modisco.java.AnonymousClassDeclaration;
>-import org.eclipse.gmt.modisco.java.ArrayAccess;
>-import org.eclipse.gmt.modisco.java.ArrayCreation;
>-import org.eclipse.gmt.modisco.java.ArrayInitializer;
>-import org.eclipse.gmt.modisco.java.ArrayLengthAccess;
>-import org.eclipse.gmt.modisco.java.ArrayType;
>-import org.eclipse.gmt.modisco.java.AssertStatement;
>-import org.eclipse.gmt.modisco.java.Assignment;
>-import org.eclipse.gmt.modisco.java.Block;
>-import org.eclipse.gmt.modisco.java.BlockComment;
>-import org.eclipse.gmt.modisco.java.BodyDeclaration;
>-import org.eclipse.gmt.modisco.java.BooleanLiteral;
>-import org.eclipse.gmt.modisco.java.BreakStatement;
>-import org.eclipse.gmt.modisco.java.CastExpression;
>-import org.eclipse.gmt.modisco.java.CatchClause;
>-import org.eclipse.gmt.modisco.java.CharacterLiteral;
>-import org.eclipse.gmt.modisco.java.ClassDeclaration;
>-import org.eclipse.gmt.modisco.java.ClassInstanceCreation;
>-import org.eclipse.gmt.modisco.java.Comment;
>-import org.eclipse.gmt.modisco.java.CompilationUnit;
>-import org.eclipse.gmt.modisco.java.ConditionalExpression;
>-import org.eclipse.gmt.modisco.java.ConstructorDeclaration;
>-import org.eclipse.gmt.modisco.java.ConstructorInvocation;
>-import org.eclipse.gmt.modisco.java.ContinueStatement;
>-import org.eclipse.gmt.modisco.java.DoStatement;
>-import org.eclipse.gmt.modisco.java.EmptyStatement;
>-import org.eclipse.gmt.modisco.java.EnhancedForStatement;
>-import org.eclipse.gmt.modisco.java.EnumConstantDeclaration;
>-import org.eclipse.gmt.modisco.java.EnumDeclaration;
>-import org.eclipse.gmt.modisco.java.Expression;
>-import org.eclipse.gmt.modisco.java.ExpressionStatement;
>-import org.eclipse.gmt.modisco.java.FieldAccess;
>-import org.eclipse.gmt.modisco.java.FieldDeclaration;
>-import org.eclipse.gmt.modisco.java.ForStatement;
>-import org.eclipse.gmt.modisco.java.IfStatement;
>-import org.eclipse.gmt.modisco.java.ImportDeclaration;
>-import org.eclipse.gmt.modisco.java.InfixExpression;
>-import org.eclipse.gmt.modisco.java.Initializer;
>-import org.eclipse.gmt.modisco.java.InstanceofExpression;
>-import org.eclipse.gmt.modisco.java.InterfaceDeclaration;
>-import org.eclipse.gmt.modisco.java.Javadoc;
>-import org.eclipse.gmt.modisco.java.LabeledStatement;
>-import org.eclipse.gmt.modisco.java.LineComment;
>-import org.eclipse.gmt.modisco.java.MemberRef;
>-import org.eclipse.gmt.modisco.java.MethodDeclaration;
>-import org.eclipse.gmt.modisco.java.MethodInvocation;
>-import org.eclipse.gmt.modisco.java.MethodRef;
>-import org.eclipse.gmt.modisco.java.MethodRefParameter;
>-import org.eclipse.gmt.modisco.java.Model;
>-import org.eclipse.gmt.modisco.java.Modifier;
>-import org.eclipse.gmt.modisco.java.NamedElement;
>-import org.eclipse.gmt.modisco.java.NullLiteral;
>-import org.eclipse.gmt.modisco.java.NumberLiteral;
>-import org.eclipse.gmt.modisco.java.PackageAccess;
>-import org.eclipse.gmt.modisco.java.ParameterizedType;
>-import org.eclipse.gmt.modisco.java.ParenthesizedExpression;
>-import org.eclipse.gmt.modisco.java.PostfixExpression;
>-import org.eclipse.gmt.modisco.java.PrefixExpression;
>-import org.eclipse.gmt.modisco.java.PrimitiveType;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeBoolean;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeByte;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeChar;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeDouble;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeFloat;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeInt;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeLong;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeShort;
>-import org.eclipse.gmt.modisco.java.PrimitiveTypeVoid;
>-import org.eclipse.gmt.modisco.java.ReturnStatement;
>-import org.eclipse.gmt.modisco.java.SingleVariableAccess;
>-import org.eclipse.gmt.modisco.java.SingleVariableDeclaration;
>-import org.eclipse.gmt.modisco.java.Statement;
>-import org.eclipse.gmt.modisco.java.StringLiteral;
>-import org.eclipse.gmt.modisco.java.SuperConstructorInvocation;
>-import org.eclipse.gmt.modisco.java.SuperFieldAccess;
>-import org.eclipse.gmt.modisco.java.SuperMethodInvocation;
>-import org.eclipse.gmt.modisco.java.SwitchCase;
>-import org.eclipse.gmt.modisco.java.SwitchStatement;
>-import org.eclipse.gmt.modisco.java.SynchronizedStatement;
>-import org.eclipse.gmt.modisco.java.TagElement;
>-import org.eclipse.gmt.modisco.java.TextElement;
>-import org.eclipse.gmt.modisco.java.ThisExpression;
>-import org.eclipse.gmt.modisco.java.ThrowStatement;
>-import org.eclipse.gmt.modisco.java.TryStatement;
>-import org.eclipse.gmt.modisco.java.Type;
>-import org.eclipse.gmt.modisco.java.TypeAccess;
>-import org.eclipse.gmt.modisco.java.TypeDeclaration;
>-import org.eclipse.gmt.modisco.java.TypeDeclarationStatement;
>-import org.eclipse.gmt.modisco.java.TypeLiteral;
>-import org.eclipse.gmt.modisco.java.TypeParameter;
>-import org.eclipse.gmt.modisco.java.UnresolvedAnnotationDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedAnnotationTypeMemberDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedClassDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedEnumDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedInterfaceDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedItem;
>-import org.eclipse.gmt.modisco.java.UnresolvedItemAccess;
>-import org.eclipse.gmt.modisco.java.UnresolvedLabeledStatement;
>-import org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedSingleVariableDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedType;
>-import org.eclipse.gmt.modisco.java.UnresolvedTypeDeclaration;
>-import org.eclipse.gmt.modisco.java.UnresolvedVariableDeclarationFragment;
>-import org.eclipse.gmt.modisco.java.VariableDeclaration;
>-import org.eclipse.gmt.modisco.java.VariableDeclarationExpression;
>-import org.eclipse.gmt.modisco.java.VariableDeclarationFragment;
>-import org.eclipse.gmt.modisco.java.VariableDeclarationStatement;
>-import org.eclipse.gmt.modisco.java.WhileStatement;
>-import org.eclipse.gmt.modisco.java.WildCardType;
>-
>+import org.eclipse.gmt.modisco.java.*;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
> 
> /**
>@@ -269,6 +149,14 @@
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case JavaPackage.ARCHIVE: {
>+				Archive archive = (Archive)theEObject;
>+				T result = caseArchive(archive);
>+				if (result == null) result = caseNamedElement(archive);
>+				if (result == null) result = caseASTNode(archive);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case JavaPackage.ASSERT_STATEMENT: {
> 				AssertStatement assertStatement = (AssertStatement)theEObject;
> 				T result = caseAssertStatement(assertStatement);
>@@ -431,6 +319,14 @@
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case JavaPackage.CLASS_FILE: {
>+				ClassFile classFile = (ClassFile)theEObject;
>+				T result = caseClassFile(classFile);
>+				if (result == null) result = caseNamedElement(classFile);
>+				if (result == null) result = caseASTNode(classFile);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case JavaPackage.CLASS_INSTANCE_CREATION: {
> 				ClassInstanceCreation classInstanceCreation = (ClassInstanceCreation)theEObject;
> 				T result = caseClassInstanceCreation(classInstanceCreation);
>@@ -665,6 +561,24 @@
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case JavaPackage.MANIFEST: {
>+				Manifest manifest = (Manifest)theEObject;
>+				T result = caseManifest(manifest);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case JavaPackage.MANIFEST_ATTRIBUTE: {
>+				ManifestAttribute manifestAttribute = (ManifestAttribute)theEObject;
>+				T result = caseManifestAttribute(manifestAttribute);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
>+			case JavaPackage.MANIFEST_ENTRY: {
>+				ManifestEntry manifestEntry = (ManifestEntry)theEObject;
>+				T result = caseManifestEntry(manifestEntry);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case JavaPackage.MEMBER_REF: {
> 				MemberRef memberRef = (MemberRef)theEObject;
> 				T result = caseMemberRef(memberRef);
>@@ -725,6 +639,13 @@
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
> 			}
>+			case JavaPackage.NAMESPACE_ACCESS: {
>+				NamespaceAccess namespaceAccess = (NamespaceAccess)theEObject;
>+				T result = caseNamespaceAccess(namespaceAccess);
>+				if (result == null) result = caseASTNode(namespaceAccess);
>+				if (result == null) result = defaultCase(theEObject);
>+				return result;
>+			}
> 			case JavaPackage.NUMBER_LITERAL: {
> 				NumberLiteral numberLiteral = (NumberLiteral)theEObject;
> 				T result = caseNumberLiteral(numberLiteral);
>@@ -752,7 +673,7 @@
> 			case JavaPackage.PACKAGE_ACCESS: {
> 				PackageAccess packageAccess = (PackageAccess)theEObject;
> 				T result = casePackageAccess(packageAccess);
>-				if (result == null) result = caseExpression(packageAccess);
>+				if (result == null) result = caseNamespaceAccess(packageAccess);
> 				if (result == null) result = caseASTNode(packageAccess);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
>@@ -1032,6 +953,7 @@
> 				TypeAccess typeAccess = (TypeAccess)theEObject;
> 				T result = caseTypeAccess(typeAccess);
> 				if (result == null) result = caseExpression(typeAccess);
>+				if (result == null) result = caseNamespaceAccess(typeAccess);
> 				if (result == null) result = caseASTNode(typeAccess);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
>@@ -1084,6 +1006,7 @@
> 				UnresolvedItemAccess unresolvedItemAccess = (UnresolvedItemAccess)theEObject;
> 				T result = caseUnresolvedItemAccess(unresolvedItemAccess);
> 				if (result == null) result = caseExpression(unresolvedItemAccess);
>+				if (result == null) result = caseNamespaceAccess(unresolvedItemAccess);
> 				if (result == null) result = caseASTNode(unresolvedItemAccess);
> 				if (result == null) result = defaultCase(theEObject);
> 				return result;
>@@ -1277,812 +1200,902 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Abstract Method Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'AST Node'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Abstract Method Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'AST Node'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAbstractMethodDeclaration(AbstractMethodDeclaration object) {
>+	public T caseASTNode(ASTNode object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Abstract Method Invocation'.
>+	 * Returns the result of interpreting the object as an instance of 'Compilation Unit'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Abstract Method Invocation'.
>+	 * @return the result of interpreting the object as an instance of 'Compilation Unit'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAbstractMethodInvocation(AbstractMethodInvocation object) {
>+	public T caseCompilationUnit(CompilationUnit object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Abstract Type Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Import Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Abstract Type Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Import Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAbstractTypeDeclaration(AbstractTypeDeclaration object) {
>+	public T caseImportDeclaration(ImportDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Abstract Type Qualified Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Model'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Abstract Type Qualified Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Model'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAbstractTypeQualifiedExpression(AbstractTypeQualifiedExpression object) {
>+	public T caseModel(Model object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Abstract Variables Container'.
>+	 * Returns the result of interpreting the object as an instance of 'Modifier'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Abstract Variables Container'.
>+	 * @return the result of interpreting the object as an instance of 'Modifier'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAbstractVariablesContainer(AbstractVariablesContainer object) {
>+	public T caseModifier(Modifier object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Annotation'.
>+	 * Returns the result of interpreting the object as an instance of 'Package'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Annotation'.
>+	 * @return the result of interpreting the object as an instance of 'Package'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAnnotation(Annotation object) {
>+	public T casePackage(org.eclipse.gmt.modisco.java.Package object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Assert Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Named Element'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Assert Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Named Element'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAssertStatement(AssertStatement object) {
>+	public T caseNamedElement(NamedElement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'AST Node'.
>+	 * Returns the result of interpreting the object as an instance of 'Namespace Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'AST Node'.
>+	 * @return the result of interpreting the object as an instance of 'Namespace Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseASTNode(ASTNode object) {
>+	public T caseNamespaceAccess(NamespaceAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Annotation Member Value Pair'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Item'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Annotation Member Value Pair'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Item'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAnnotationMemberValuePair(AnnotationMemberValuePair object) {
>+	public T caseUnresolvedItem(UnresolvedItem object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Annotation Type Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Item Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Annotation Type Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Item Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAnnotationTypeDeclaration(AnnotationTypeDeclaration object) {
>+	public T caseUnresolvedItemAccess(UnresolvedItemAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Annotation Type Member Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Comment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Annotation Type Member Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Comment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAnnotationTypeMemberDeclaration(AnnotationTypeMemberDeclaration object) {
>+	public T caseComment(Comment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Anonymous Class Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Block Comment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Anonymous Class Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Block Comment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAnonymousClassDeclaration(AnonymousClassDeclaration object) {
>+	public T caseBlockComment(BlockComment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Array Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Javadoc'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Array Access'.
>+	 * @return the result of interpreting the object as an instance of 'Javadoc'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseArrayAccess(ArrayAccess object) {
>+	public T caseJavadoc(Javadoc object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Array Creation'.
>+	 * Returns the result of interpreting the object as an instance of 'Line Comment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Array Creation'.
>+	 * @return the result of interpreting the object as an instance of 'Line Comment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseArrayCreation(ArrayCreation object) {
>+	public T caseLineComment(LineComment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Array Initializer'.
>+	 * Returns the result of interpreting the object as an instance of 'Manifest'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Array Initializer'.
>+	 * @return the result of interpreting the object as an instance of 'Manifest'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseArrayInitializer(ArrayInitializer object) {
>+	public T caseManifest(Manifest object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Array Length Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Manifest Attribute'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Array Length Access'.
>+	 * @return the result of interpreting the object as an instance of 'Manifest Attribute'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseArrayLengthAccess(ArrayLengthAccess object) {
>+	public T caseManifestAttribute(ManifestAttribute object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Array Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Manifest Entry'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Array Type'.
>+	 * @return the result of interpreting the object as an instance of 'Manifest Entry'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseArrayType(ArrayType object) {
>+	public T caseManifestEntry(ManifestEntry object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Assignment'.
>+	 * Returns the result of interpreting the object as an instance of 'Member Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Assignment'.
>+	 * @return the result of interpreting the object as an instance of 'Member Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseAssignment(Assignment object) {
>+	public T caseMemberRef(MemberRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Body Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Method Ref'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Body Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Method Ref'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseBodyDeclaration(BodyDeclaration object) {
>+	public T caseMethodRef(MethodRef object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Boolean Literal'.
>+	 * Returns the result of interpreting the object as an instance of 'Method Ref Parameter'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Boolean Literal'.
>+	 * @return the result of interpreting the object as an instance of 'Method Ref Parameter'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseBooleanLiteral(BooleanLiteral object) {
>+	public T caseMethodRefParameter(MethodRefParameter object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Block Comment'.
>+	 * Returns the result of interpreting the object as an instance of 'Tag Element'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Block Comment'.
>+	 * @return the result of interpreting the object as an instance of 'Tag Element'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseBlockComment(BlockComment object) {
>+	public T caseTagElement(TagElement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Block'.
>+	 * Returns the result of interpreting the object as an instance of 'Text Element'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Block'.
>+	 * @return the result of interpreting the object as an instance of 'Text Element'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseBlock(Block object) {
>+	public T caseTextElement(TextElement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Break Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Abstract Type Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Break Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Abstract Type Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseBreakStatement(BreakStatement object) {
>+	public T caseAbstractTypeDeclaration(AbstractTypeDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Cast Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Annotation Type Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Cast Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Annotation Type Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseCastExpression(CastExpression object) {
>+	public T caseAnnotationTypeDeclaration(AnnotationTypeDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Catch Clause'.
>+	 * Returns the result of interpreting the object as an instance of 'Anonymous Class Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Catch Clause'.
>+	 * @return the result of interpreting the object as an instance of 'Anonymous Class Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseCatchClause(CatchClause object) {
>+	public T caseAnonymousClassDeclaration(AnonymousClassDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Character Literal'.
>+	 * Returns the result of interpreting the object as an instance of 'Array Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Character Literal'.
>+	 * @return the result of interpreting the object as an instance of 'Array Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseCharacterLiteral(CharacterLiteral object) {
>+	public T caseArrayType(ArrayType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Class Instance Creation'.
>+	 * Returns the result of interpreting the object as an instance of 'Class Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Class Instance Creation'.
>+	 * @return the result of interpreting the object as an instance of 'Class Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseClassInstanceCreation(ClassInstanceCreation object) {
>+	public T caseClassDeclaration(ClassDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Constructor Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Enum Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Constructor Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Enum Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseConstructorDeclaration(ConstructorDeclaration object) {
>+	public T caseEnumDeclaration(EnumDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Conditional Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Interface Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Conditional Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Interface Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseConditionalExpression(ConditionalExpression object) {
>+	public T caseInterfaceDeclaration(InterfaceDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Constructor Invocation'.
>+	 * Returns the result of interpreting the object as an instance of 'Parameterized Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Constructor Invocation'.
>+	 * @return the result of interpreting the object as an instance of 'Parameterized Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseConstructorInvocation(ConstructorInvocation object) {
>+	public T caseParameterizedType(ParameterizedType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Class Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Class Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseClassDeclaration(ClassDeclaration object) {
>+	public T casePrimitiveType(PrimitiveType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Comment'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Boolean'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Comment'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Boolean'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseComment(Comment object) {
>+	public T casePrimitiveTypeBoolean(PrimitiveTypeBoolean object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Compilation Unit'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Byte'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Compilation Unit'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Byte'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseCompilationUnit(CompilationUnit object) {
>+	public T casePrimitiveTypeByte(PrimitiveTypeByte object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Continue Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Char'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Continue Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Char'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseContinueStatement(ContinueStatement object) {
>+	public T casePrimitiveTypeChar(PrimitiveTypeChar object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Do Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Double'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Do Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Double'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseDoStatement(DoStatement object) {
>+	public T casePrimitiveTypeDouble(PrimitiveTypeDouble object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Empty Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Short'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Empty Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Short'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseEmptyStatement(EmptyStatement object) {
>+	public T casePrimitiveTypeShort(PrimitiveTypeShort object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Enhanced For Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Float'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Enhanced For Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Float'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseEnhancedForStatement(EnhancedForStatement object) {
>+	public T casePrimitiveTypeFloat(PrimitiveTypeFloat object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Enum Constant Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Int'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Enum Constant Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Int'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseEnumConstantDeclaration(EnumConstantDeclaration object) {
>+	public T casePrimitiveTypeInt(PrimitiveTypeInt object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Enum Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Long'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Enum Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Long'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseEnumDeclaration(EnumDeclaration object) {
>+	public T casePrimitiveTypeLong(PrimitiveTypeLong object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Primitive Type Void'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Primitive Type Void'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseExpression(Expression object) {
>+	public T casePrimitiveTypeVoid(PrimitiveTypeVoid object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Expression Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Expression Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseExpressionStatement(ExpressionStatement object) {
>+	public T caseType(Type object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Field Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Type Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Field Access'.
>+	 * @return the result of interpreting the object as an instance of 'Type Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseFieldAccess(FieldAccess object) {
>+	public T caseTypeDeclaration(TypeDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Field Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Type Parameter'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Field Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Type Parameter'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseFieldDeclaration(FieldDeclaration object) {
>+	public T caseTypeParameter(TypeParameter object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'For Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Annotation Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'For Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Annotation Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseForStatement(ForStatement object) {
>+	public T caseUnresolvedAnnotationDeclaration(UnresolvedAnnotationDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'If Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Class Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'If Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Class Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseIfStatement(IfStatement object) {
>+	public T caseUnresolvedClassDeclaration(UnresolvedClassDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Import Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Enum Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Import Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Enum Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseImportDeclaration(ImportDeclaration object) {
>+	public T caseUnresolvedEnumDeclaration(UnresolvedEnumDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Infix Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Interface Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Infix Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Interface Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseInfixExpression(InfixExpression object) {
>+	public T caseUnresolvedInterfaceDeclaration(UnresolvedInterfaceDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Initializer'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Initializer'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseInitializer(Initializer object) {
>+	public T caseUnresolvedType(UnresolvedType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Instanceof Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Type Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Instanceof Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Type Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseInstanceofExpression(InstanceofExpression object) {
>+	public T caseUnresolvedTypeDeclaration(UnresolvedTypeDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Interface Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Wild Card Type'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Interface Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Wild Card Type'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseInterfaceDeclaration(InterfaceDeclaration object) {
>+	public T caseWildCardType(WildCardType object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Javadoc'.
>+	 * Returns the result of interpreting the object as an instance of 'Abstract Method Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Javadoc'.
>+	 * @return the result of interpreting the object as an instance of 'Abstract Method Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseJavadoc(Javadoc object) {
>+	public T caseAbstractMethodDeclaration(AbstractMethodDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Labeled Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Abstract Method Invocation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Labeled Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Abstract Method Invocation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseLabeledStatement(LabeledStatement object) {
>+	public T caseAbstractMethodInvocation(AbstractMethodInvocation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Line Comment'.
>+	 * Returns the result of interpreting the object as an instance of 'Abstract Variables Container'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Line Comment'.
>+	 * @return the result of interpreting the object as an instance of 'Abstract Variables Container'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseLineComment(LineComment object) {
>+	public T caseAbstractVariablesContainer(AbstractVariablesContainer object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Member Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Annotation Member Value Pair'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Member Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Annotation Member Value Pair'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseMemberRef(MemberRef object) {
>+	public T caseAnnotationMemberValuePair(AnnotationMemberValuePair object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Annotation Type Member Declaration'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Annotation Type Member Declaration'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseAnnotationTypeMemberDeclaration(AnnotationTypeMemberDeclaration object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Body Declaration'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Body Declaration'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseBodyDeclaration(BodyDeclaration object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Constructor Declaration'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Constructor Declaration'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseConstructorDeclaration(ConstructorDeclaration object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Enum Constant Declaration'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Enum Constant Declaration'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseEnumConstantDeclaration(EnumConstantDeclaration object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Field Declaration'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Field Declaration'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseFieldDeclaration(FieldDeclaration object) {
>+		return null;
>+	}
>+
>+	/**
>+	 * Returns the result of interpreting the object as an instance of 'Initializer'.
>+	 * 
>+	 * This implementation returns null;
>+	 * returning a non-null result will terminate the switch.
>+	 * 
>+	 * @param object the target of the switch.
>+	 * @return the result of interpreting the object as an instance of 'Initializer'.
>+	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
>+	 * @generated
>+	 */
>+	public T caseInitializer(Initializer object) {
> 		return null;
> 	}
> 
>@@ -2102,962 +2115,962 @@
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Method Invocation'.
>+	 * Returns the result of interpreting the object as an instance of 'Single Variable Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Method Invocation'.
>+	 * @return the result of interpreting the object as an instance of 'Single Variable Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseMethodInvocation(MethodInvocation object) {
>+	public T caseSingleVariableDeclaration(SingleVariableDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Method Ref'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Annotation Type Member Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Method Ref'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Annotation Type Member Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseMethodRef(MethodRef object) {
>+	public T caseUnresolvedAnnotationTypeMemberDeclaration(UnresolvedAnnotationTypeMemberDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Method Ref Parameter'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Method Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Method Ref Parameter'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Method Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseMethodRefParameter(MethodRefParameter object) {
>+	public T caseUnresolvedMethodDeclaration(UnresolvedMethodDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Model'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Variable Declaration Fragment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Model'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Variable Declaration Fragment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseModel(Model object) {
>+	public T caseUnresolvedVariableDeclarationFragment(UnresolvedVariableDeclarationFragment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Modifier'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Single Variable Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Modifier'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Single Variable Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseModifier(Modifier object) {
>+	public T caseUnresolvedSingleVariableDeclaration(UnresolvedSingleVariableDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Named Element'.
>+	 * Returns the result of interpreting the object as an instance of 'Variable Declaration'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Named Element'.
>+	 * @return the result of interpreting the object as an instance of 'Variable Declaration'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseNamedElement(NamedElement object) {
>+	public T caseVariableDeclaration(VariableDeclaration object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Number Literal'.
>+	 * Returns the result of interpreting the object as an instance of 'Variable Declaration Fragment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Number Literal'.
>+	 * @return the result of interpreting the object as an instance of 'Variable Declaration Fragment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseNumberLiteral(NumberLiteral object) {
>+	public T caseVariableDeclarationFragment(VariableDeclarationFragment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Null Literal'.
>+	 * Returns the result of interpreting the object as an instance of 'Abstract Type Qualified Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Null Literal'.
>+	 * @return the result of interpreting the object as an instance of 'Abstract Type Qualified Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseNullLiteral(NullLiteral object) {
>+	public T caseAbstractTypeQualifiedExpression(AbstractTypeQualifiedExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Package'.
>+	 * Returns the result of interpreting the object as an instance of 'Annotation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Package'.
>+	 * @return the result of interpreting the object as an instance of 'Annotation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePackage(org.eclipse.gmt.modisco.java.Package object) {
>+	public T caseAnnotation(Annotation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Package Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Archive'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Package Access'.
>+	 * @return the result of interpreting the object as an instance of 'Archive'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePackageAccess(PackageAccess object) {
>+	public T caseArchive(Archive object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Parameterized Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Array Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Parameterized Type'.
>+	 * @return the result of interpreting the object as an instance of 'Array Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseParameterizedType(ParameterizedType object) {
>+	public T caseArrayAccess(ArrayAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Parenthesized Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Array Creation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Parenthesized Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Array Creation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseParenthesizedExpression(ParenthesizedExpression object) {
>+	public T caseArrayCreation(ArrayCreation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Postfix Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Array Initializer'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Postfix Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Array Initializer'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePostfixExpression(PostfixExpression object) {
>+	public T caseArrayInitializer(ArrayInitializer object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Prefix Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Array Length Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Prefix Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Array Length Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrefixExpression(PrefixExpression object) {
>+	public T caseArrayLengthAccess(ArrayLengthAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Assignment'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type'.
>+	 * @return the result of interpreting the object as an instance of 'Assignment'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveType(PrimitiveType object) {
>+	public T caseAssignment(Assignment object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Boolean'.
>+	 * Returns the result of interpreting the object as an instance of 'Boolean Literal'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Boolean'.
>+	 * @return the result of interpreting the object as an instance of 'Boolean Literal'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeBoolean(PrimitiveTypeBoolean object) {
>+	public T caseBooleanLiteral(BooleanLiteral object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Byte'.
>+	 * Returns the result of interpreting the object as an instance of 'Cast Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Byte'.
>+	 * @return the result of interpreting the object as an instance of 'Cast Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeByte(PrimitiveTypeByte object) {
>+	public T caseCastExpression(CastExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Char'.
>+	 * Returns the result of interpreting the object as an instance of 'Character Literal'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Char'.
>+	 * @return the result of interpreting the object as an instance of 'Character Literal'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeChar(PrimitiveTypeChar object) {
>+	public T caseCharacterLiteral(CharacterLiteral object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Double'.
>+	 * Returns the result of interpreting the object as an instance of 'Class File'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Double'.
>+	 * @return the result of interpreting the object as an instance of 'Class File'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeDouble(PrimitiveTypeDouble object) {
>+	public T caseClassFile(ClassFile object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Short'.
>+	 * Returns the result of interpreting the object as an instance of 'Class Instance Creation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Short'.
>+	 * @return the result of interpreting the object as an instance of 'Class Instance Creation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeShort(PrimitiveTypeShort object) {
>+	public T caseClassInstanceCreation(ClassInstanceCreation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Float'.
>+	 * Returns the result of interpreting the object as an instance of 'Conditional Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Float'.
>+	 * @return the result of interpreting the object as an instance of 'Conditional Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeFloat(PrimitiveTypeFloat object) {
>+	public T caseConditionalExpression(ConditionalExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Int'.
>+	 * Returns the result of interpreting the object as an instance of 'Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Int'.
>+	 * @return the result of interpreting the object as an instance of 'Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeInt(PrimitiveTypeInt object) {
>+	public T caseExpression(Expression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Long'.
>+	 * Returns the result of interpreting the object as an instance of 'Field Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Long'.
>+	 * @return the result of interpreting the object as an instance of 'Field Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeLong(PrimitiveTypeLong object) {
>+	public T caseFieldAccess(FieldAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Primitive Type Void'.
>+	 * Returns the result of interpreting the object as an instance of 'Infix Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Primitive Type Void'.
>+	 * @return the result of interpreting the object as an instance of 'Infix Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T casePrimitiveTypeVoid(PrimitiveTypeVoid object) {
>+	public T caseInfixExpression(InfixExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Return Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Instanceof Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Return Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Instanceof Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseReturnStatement(ReturnStatement object) {
>+	public T caseInstanceofExpression(InstanceofExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Single Variable Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Method Invocation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Single Variable Access'.
>+	 * @return the result of interpreting the object as an instance of 'Method Invocation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSingleVariableAccess(SingleVariableAccess object) {
>+	public T caseMethodInvocation(MethodInvocation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Single Variable Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Number Literal'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Single Variable Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Number Literal'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSingleVariableDeclaration(SingleVariableDeclaration object) {
>+	public T caseNumberLiteral(NumberLiteral object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Null Literal'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Null Literal'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseStatement(Statement object) {
>+	public T caseNullLiteral(NullLiteral object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'String Literal'.
>+	 * Returns the result of interpreting the object as an instance of 'Parenthesized Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'String Literal'.
>+	 * @return the result of interpreting the object as an instance of 'Parenthesized Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseStringLiteral(StringLiteral object) {
>+	public T caseParenthesizedExpression(ParenthesizedExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Super Constructor Invocation'.
>+	 * Returns the result of interpreting the object as an instance of 'Postfix Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Super Constructor Invocation'.
>+	 * @return the result of interpreting the object as an instance of 'Postfix Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSuperConstructorInvocation(SuperConstructorInvocation object) {
>+	public T casePostfixExpression(PostfixExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Super Field Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Prefix Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Super Field Access'.
>+	 * @return the result of interpreting the object as an instance of 'Prefix Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSuperFieldAccess(SuperFieldAccess object) {
>+	public T casePrefixExpression(PrefixExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Super Method Invocation'.
>+	 * Returns the result of interpreting the object as an instance of 'Package Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Super Method Invocation'.
>+	 * @return the result of interpreting the object as an instance of 'Package Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSuperMethodInvocation(SuperMethodInvocation object) {
>+	public T casePackageAccess(PackageAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Switch Case'.
>+	 * Returns the result of interpreting the object as an instance of 'Single Variable Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Switch Case'.
>+	 * @return the result of interpreting the object as an instance of 'Single Variable Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSwitchCase(SwitchCase object) {
>+	public T caseSingleVariableAccess(SingleVariableAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Switch Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'String Literal'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Switch Statement'.
>+	 * @return the result of interpreting the object as an instance of 'String Literal'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSwitchStatement(SwitchStatement object) {
>+	public T caseStringLiteral(StringLiteral object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Synchronized Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Super Field Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Synchronized Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Super Field Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseSynchronizedStatement(SynchronizedStatement object) {
>+	public T caseSuperFieldAccess(SuperFieldAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Tag Element'.
>+	 * Returns the result of interpreting the object as an instance of 'Super Method Invocation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Tag Element'.
>+	 * @return the result of interpreting the object as an instance of 'Super Method Invocation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTagElement(TagElement object) {
>+	public T caseSuperMethodInvocation(SuperMethodInvocation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Text Element'.
>+	 * Returns the result of interpreting the object as an instance of 'This Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Text Element'.
>+	 * @return the result of interpreting the object as an instance of 'This Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTextElement(TextElement object) {
>+	public T caseThisExpression(ThisExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'This Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Type Literal'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'This Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Type Literal'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseThisExpression(ThisExpression object) {
>+	public T caseTypeLiteral(TypeLiteral object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Throw Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Type Access'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Throw Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Type Access'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseThrowStatement(ThrowStatement object) {
>+	public T caseTypeAccess(TypeAccess object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Try Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Variable Declaration Expression'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Try Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Variable Declaration Expression'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTryStatement(TryStatement object) {
>+	public T caseVariableDeclarationExpression(VariableDeclarationExpression object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Assert Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type'.
>+	 * @return the result of interpreting the object as an instance of 'Assert Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseType(Type object) {
>+	public T caseAssertStatement(AssertStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Block'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Access'.
>+	 * @return the result of interpreting the object as an instance of 'Block'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTypeAccess(TypeAccess object) {
>+	public T caseBlock(Block object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Break Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Break Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTypeDeclaration(TypeDeclaration object) {
>+	public T caseBreakStatement(BreakStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Declaration Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Catch Clause'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Declaration Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Catch Clause'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTypeDeclarationStatement(TypeDeclarationStatement object) {
>+	public T caseCatchClause(CatchClause object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Literal'.
>+	 * Returns the result of interpreting the object as an instance of 'Constructor Invocation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Literal'.
>+	 * @return the result of interpreting the object as an instance of 'Constructor Invocation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTypeLiteral(TypeLiteral object) {
>+	public T caseConstructorInvocation(ConstructorInvocation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Type Parameter'.
>+	 * Returns the result of interpreting the object as an instance of 'Continue Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Type Parameter'.
>+	 * @return the result of interpreting the object as an instance of 'Continue Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseTypeParameter(TypeParameter object) {
>+	public T caseContinueStatement(ContinueStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Item'.
>+	 * Returns the result of interpreting the object as an instance of 'Do Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Item'.
>+	 * @return the result of interpreting the object as an instance of 'Do Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedItem(UnresolvedItem object) {
>+	public T caseDoStatement(DoStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Item Access'.
>+	 * Returns the result of interpreting the object as an instance of 'Empty Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Item Access'.
>+	 * @return the result of interpreting the object as an instance of 'Empty Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedItemAccess(UnresolvedItemAccess object) {
>+	public T caseEmptyStatement(EmptyStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Annotation Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Enhanced For Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Annotation Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Enhanced For Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedAnnotationDeclaration(UnresolvedAnnotationDeclaration object) {
>+	public T caseEnhancedForStatement(EnhancedForStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Annotation Type Member Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Expression Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Annotation Type Member Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Expression Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedAnnotationTypeMemberDeclaration(UnresolvedAnnotationTypeMemberDeclaration object) {
>+	public T caseExpressionStatement(ExpressionStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Class Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'For Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Class Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'For Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedClassDeclaration(UnresolvedClassDeclaration object) {
>+	public T caseForStatement(ForStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Enum Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'If Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Enum Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'If Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedEnumDeclaration(UnresolvedEnumDeclaration object) {
>+	public T caseIfStatement(IfStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Interface Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Labeled Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Interface Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Labeled Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedInterfaceDeclaration(UnresolvedInterfaceDeclaration object) {
>+	public T caseLabeledStatement(LabeledStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Labeled Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Return Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Labeled Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Return Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedLabeledStatement(UnresolvedLabeledStatement object) {
>+	public T caseReturnStatement(ReturnStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Method Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Method Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedMethodDeclaration(UnresolvedMethodDeclaration object) {
>+	public T caseStatement(Statement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Single Variable Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Super Constructor Invocation'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Single Variable Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Super Constructor Invocation'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedSingleVariableDeclaration(UnresolvedSingleVariableDeclaration object) {
>+	public T caseSuperConstructorInvocation(SuperConstructorInvocation object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Switch Case'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Type'.
>+	 * @return the result of interpreting the object as an instance of 'Switch Case'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedType(UnresolvedType object) {
>+	public T caseSwitchCase(SwitchCase object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Type Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Switch Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Type Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Switch Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedTypeDeclaration(UnresolvedTypeDeclaration object) {
>+	public T caseSwitchStatement(SwitchStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Unresolved Variable Declaration Fragment'.
>+	 * Returns the result of interpreting the object as an instance of 'Synchronized Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Unresolved Variable Declaration Fragment'.
>+	 * @return the result of interpreting the object as an instance of 'Synchronized Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseUnresolvedVariableDeclarationFragment(UnresolvedVariableDeclarationFragment object) {
>+	public T caseSynchronizedStatement(SynchronizedStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Variable Declaration'.
>+	 * Returns the result of interpreting the object as an instance of 'Throw Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Variable Declaration'.
>+	 * @return the result of interpreting the object as an instance of 'Throw Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseVariableDeclaration(VariableDeclaration object) {
>+	public T caseThrowStatement(ThrowStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Variable Declaration Expression'.
>+	 * Returns the result of interpreting the object as an instance of 'Type Declaration Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Variable Declaration Expression'.
>+	 * @return the result of interpreting the object as an instance of 'Type Declaration Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseVariableDeclarationExpression(VariableDeclarationExpression object) {
>+	public T caseTypeDeclarationStatement(TypeDeclarationStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Variable Declaration Fragment'.
>+	 * Returns the result of interpreting the object as an instance of 'Try Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Variable Declaration Fragment'.
>+	 * @return the result of interpreting the object as an instance of 'Try Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseVariableDeclarationFragment(VariableDeclarationFragment object) {
>+	public T caseTryStatement(TryStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Variable Declaration Statement'.
>+	 * Returns the result of interpreting the object as an instance of 'Unresolved Labeled Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Variable Declaration Statement'.
>+	 * @return the result of interpreting the object as an instance of 'Unresolved Labeled Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseVariableDeclarationStatement(VariableDeclarationStatement object) {
>+	public T caseUnresolvedLabeledStatement(UnresolvedLabeledStatement object) {
> 		return null;
> 	}
> 
> 	/**
>-	 * Returns the result of interpreting the object as an instance of 'Wild Card Type'.
>+	 * Returns the result of interpreting the object as an instance of 'Variable Declaration Statement'.
> 	 * 
> 	 * This implementation returns null;
> 	 * returning a non-null result will terminate the switch.
> 	 * 
> 	 * @param object the target of the switch.
>-	 * @return the result of interpreting the object as an instance of 'Wild Card Type'.
>+	 * @return the result of interpreting the object as an instance of 'Variable Declaration Statement'.
> 	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
> 	 * @generated
> 	 */
>-	public T caseWildCardType(WildCardType object) {
>+	public T caseVariableDeclarationStatement(VariableDeclarationStatement object) {
> 		return null;
> 	}
> 
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java	(revision 0)
>@@ -0,0 +1,242 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java.emf.impl;
>+
>+import java.util.Collection;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+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.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.gmt.modisco.java.ManifestAttribute;
>+import org.eclipse.gmt.modisco.java.ManifestEntry;
>+
>+import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Manifest Entry'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestEntryImpl#getName Name}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestEntryImpl#getAttributes Attributes}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ManifestEntryImpl extends MinimalEObjectImpl.Container implements ManifestEntry {
>+	/**
>+	 * The default value of the '{@link #getName() Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String NAME_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getName() Name}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getName()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String name = NAME_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getAttributes() Attributes}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getAttributes()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ManifestAttribute> attributes;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ManifestEntryImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaPackage.eINSTANCE.getManifestEntry();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getName() {
>+		return name;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setName(String newName) {
>+		String oldName = name;
>+		name = newName;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.MANIFEST_ENTRY__NAME, oldName, name));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EList<ManifestAttribute> getAttributes() {
>+		if (attributes == null) {
>+			attributes = new EObjectContainmentEList<ManifestAttribute>(ManifestAttribute.class, this, JavaPackage.MANIFEST_ENTRY__ATTRIBUTES);
>+		}
>+		return attributes;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ENTRY__ATTRIBUTES:
>+				return ((InternalEList<?>)getAttributes()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ENTRY__NAME:
>+				return getName();
>+			case JavaPackage.MANIFEST_ENTRY__ATTRIBUTES:
>+				return getAttributes();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ENTRY__NAME:
>+				setName((String)newValue);
>+				return;
>+			case JavaPackage.MANIFEST_ENTRY__ATTRIBUTES:
>+				getAttributes().clear();
>+				getAttributes().addAll((Collection<? extends ManifestAttribute>)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ENTRY__NAME:
>+				setName(NAME_EDEFAULT);
>+				return;
>+			case JavaPackage.MANIFEST_ENTRY__ATTRIBUTES:
>+				getAttributes().clear();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ENTRY__NAME:
>+				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
>+			case JavaPackage.MANIFEST_ENTRY__ATTRIBUTES:
>+				return attributes != null && !attributes.isEmpty();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (name: "); //$NON-NLS-1$
>+		result.append(name);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ManifestEntryImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -54,7 +55,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	protected String packageFilename = "java.ecore";
>+	protected String packageFilename = "java.ecore"; //$NON-NLS-1$
> 
> 	/**
> 	 * 
>@@ -103,6 +104,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass archiveEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass assertStatementEClass = null;
> 
> 	/**
>@@ -243,6 +251,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass classFileEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass classInstanceCreationEClass = null;
> 
> 	/**
>@@ -432,6 +447,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass manifestEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass manifestAttributeEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	private EClass manifestEntryEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass memberRefEClass = null;
> 
> 	/**
>@@ -488,6 +524,13 @@
> 	 * 
> 	 * @generated
> 	 */
>+	private EClass namespaceAccessEClass = null;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	private EClass numberLiteralEClass = null;
> 
> 	/**
>@@ -1014,26 +1057,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getAbstractMethodDeclaration_Varargs() {
>- return (EAttribute)getAbstractMethodDeclaration().getEStructuralFeatures().get(0);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public EAttribute getAbstractMethodDeclaration_QualifiedName() {
>- return (EAttribute)getAbstractMethodDeclaration().getEStructuralFeatures().get(1);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EReference getAbstractMethodDeclaration_Body() {
>- return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(2);
>+ return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -1042,7 +1067,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractMethodDeclaration_Parameters() {
>- return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(3);
>+ return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -1051,7 +1076,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractMethodDeclaration_ThrownExceptions() {
>- return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(4);
>+ return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -1060,7 +1085,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractMethodDeclaration_TypeParameters() {
>- return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(5);
>+ return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -1069,7 +1094,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractMethodDeclaration_UsagesInDocComments() {
>- return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(6);
>+ return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -1078,7 +1103,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractMethodDeclaration_Usages() {
>- return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(7);
>+ return (EReference)getAbstractMethodDeclaration().getEStructuralFeatures().get(5);
> 	}
> 
> 	/**
>@@ -1137,17 +1162,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getAbstractTypeDeclaration_QualifiedName() {
>- return (EAttribute)getAbstractTypeDeclaration().getEStructuralFeatures().get(0);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EReference getAbstractTypeDeclaration_BodyDeclarations() {
>- return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(1);
>+ return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -1156,7 +1172,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractTypeDeclaration_CommentsBeforeBody() {
>- return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(2);
>+ return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -1165,7 +1181,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractTypeDeclaration_CommentsAfterBody() {
>- return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(3);
>+ return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -1174,7 +1190,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractTypeDeclaration_Package() {
>- return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(4);
>+ return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -1183,7 +1199,7 @@
> 	 * @generated
> 	 */
> 	public EReference getAbstractTypeDeclaration_SuperInterfaces() {
>- return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(5);
>+ return (EReference)getAbstractTypeDeclaration().getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -1272,9 +1288,48 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getArchive() {
>+		if (archiveEClass == null) {
>+			archiveEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(6);
>+		}
>+		return archiveEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getArchive_OriginalFilePath() {
>+ return (EAttribute)getArchive().getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getArchive_ClassFiles() {
>+ return (EReference)getArchive().getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getArchive_Manifest() {
>+ return (EReference)getArchive().getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getAssertStatement() {
> 		if (assertStatementEClass == null) {
>-			assertStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(6);
>+			assertStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(7);
> 		}
> 		return assertStatementEClass;
> 	}
>@@ -1304,7 +1359,7 @@
> 	 */
> 	public EClass getASTNode() {
> 		if (astNodeEClass == null) {
>-			astNodeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(7);
>+			astNodeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(8);
> 		}
> 		return astNodeEClass;
> 	}
>@@ -1332,9 +1387,18 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getASTNode_OriginalClassFile() {
>+ return (EReference)getASTNode().getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getAnnotationMemberValuePair() {
> 		if (annotationMemberValuePairEClass == null) {
>-			annotationMemberValuePairEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(8);
>+			annotationMemberValuePairEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(9);
> 		}
> 		return annotationMemberValuePairEClass;
> 	}
>@@ -1364,7 +1428,7 @@
> 	 */
> 	public EClass getAnnotationTypeDeclaration() {
> 		if (annotationTypeDeclarationEClass == null) {
>-			annotationTypeDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(9);
>+			annotationTypeDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(10);
> 		}
> 		return annotationTypeDeclarationEClass;
> 	}
>@@ -1376,7 +1440,7 @@
> 	 */
> 	public EClass getAnnotationTypeMemberDeclaration() {
> 		if (annotationTypeMemberDeclarationEClass == null) {
>-			annotationTypeMemberDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(10);
>+			annotationTypeMemberDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(11);
> 		}
> 		return annotationTypeMemberDeclarationEClass;
> 	}
>@@ -1415,7 +1479,7 @@
> 	 */
> 	public EClass getAnonymousClassDeclaration() {
> 		if (anonymousClassDeclarationEClass == null) {
>-			anonymousClassDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(11);
>+			anonymousClassDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(12);
> 		}
> 		return anonymousClassDeclarationEClass;
> 	}
>@@ -1445,7 +1509,7 @@
> 	 */
> 	public EClass getArrayAccess() {
> 		if (arrayAccessEClass == null) {
>-			arrayAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(12);
>+			arrayAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(13);
> 		}
> 		return arrayAccessEClass;
> 	}
>@@ -1475,7 +1539,7 @@
> 	 */
> 	public EClass getArrayCreation() {
> 		if (arrayCreationEClass == null) {
>-			arrayCreationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(13);
>+			arrayCreationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(14);
> 		}
> 		return arrayCreationEClass;
> 	}
>@@ -1514,7 +1578,7 @@
> 	 */
> 	public EClass getArrayInitializer() {
> 		if (arrayInitializerEClass == null) {
>-			arrayInitializerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(14);
>+			arrayInitializerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(15);
> 		}
> 		return arrayInitializerEClass;
> 	}
>@@ -1535,7 +1599,7 @@
> 	 */
> 	public EClass getArrayLengthAccess() {
> 		if (arrayLengthAccessEClass == null) {
>-			arrayLengthAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(15);
>+			arrayLengthAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(16);
> 		}
> 		return arrayLengthAccessEClass;
> 	}
>@@ -1556,7 +1620,7 @@
> 	 */
> 	public EClass getArrayType() {
> 		if (arrayTypeEClass == null) {
>-			arrayTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(16);
>+			arrayTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(17);
> 		}
> 		return arrayTypeEClass;
> 	}
>@@ -1566,17 +1630,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getArrayType_QualifiedName() {
>- return (EAttribute)getArrayType().getEStructuralFeatures().get(0);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EAttribute getArrayType_Dimensions() {
>- return (EAttribute)getArrayType().getEStructuralFeatures().get(1);
>+ return (EAttribute)getArrayType().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -1585,7 +1640,7 @@
> 	 * @generated
> 	 */
> 	public EReference getArrayType_ElementType() {
>- return (EReference)getArrayType().getEStructuralFeatures().get(2);
>+ return (EReference)getArrayType().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -1595,7 +1650,7 @@
> 	 */
> 	public EClass getAssignment() {
> 		if (assignmentEClass == null) {
>-			assignmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(17);
>+			assignmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(18);
> 		}
> 		return assignmentEClass;
> 	}
>@@ -1634,7 +1689,7 @@
> 	 */
> 	public EClass getBodyDeclaration() {
> 		if (bodyDeclarationEClass == null) {
>-			bodyDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(19);
>+			bodyDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(20);
> 		}
> 		return bodyDeclarationEClass;
> 	}
>@@ -1682,7 +1737,7 @@
> 	 */
> 	public EClass getBooleanLiteral() {
> 		if (booleanLiteralEClass == null) {
>-			booleanLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(20);
>+			booleanLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(21);
> 		}
> 		return booleanLiteralEClass;
> 	}
>@@ -1703,7 +1758,7 @@
> 	 */
> 	public EClass getBlockComment() {
> 		if (blockCommentEClass == null) {
>-			blockCommentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(21);
>+			blockCommentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(22);
> 		}
> 		return blockCommentEClass;
> 	}
>@@ -1715,7 +1770,7 @@
> 	 */
> 	public EClass getBlock() {
> 		if (blockEClass == null) {
>-			blockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(22);
>+			blockEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(23);
> 		}
> 		return blockEClass;
> 	}
>@@ -1736,7 +1791,7 @@
> 	 */
> 	public EClass getBreakStatement() {
> 		if (breakStatementEClass == null) {
>-			breakStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(23);
>+			breakStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(24);
> 		}
> 		return breakStatementEClass;
> 	}
>@@ -1757,7 +1812,7 @@
> 	 */
> 	public EClass getCastExpression() {
> 		if (castExpressionEClass == null) {
>-			castExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(24);
>+			castExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(25);
> 		}
> 		return castExpressionEClass;
> 	}
>@@ -1787,7 +1842,7 @@
> 	 */
> 	public EClass getCatchClause() {
> 		if (catchClauseEClass == null) {
>-			catchClauseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(25);
>+			catchClauseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(26);
> 		}
> 		return catchClauseEClass;
> 	}
>@@ -1817,7 +1872,7 @@
> 	 */
> 	public EClass getCharacterLiteral() {
> 		if (characterLiteralEClass == null) {
>-			characterLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(26);
>+			characterLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(27);
> 		}
> 		return characterLiteralEClass;
> 	}
>@@ -1836,9 +1891,57 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getClassFile() {
>+		if (classFileEClass == null) {
>+			classFileEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(28);
>+		}
>+		return classFileEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getClassFile_OriginalFilePath() {
>+ return (EAttribute)getClassFile().getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getClassFile_Type() {
>+ return (EReference)getClassFile().getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getClassFile_AttachedSource() {
>+ return (EReference)getClassFile().getEStructuralFeatures().get(2);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getClassFile_Package() {
>+ return (EReference)getClassFile().getEStructuralFeatures().get(3);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getClassInstanceCreation() {
> 		if (classInstanceCreationEClass == null) {
>-			classInstanceCreationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(27);
>+			classInstanceCreationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(29);
> 		}
> 		return classInstanceCreationEClass;
> 	}
>@@ -1877,7 +1980,7 @@
> 	 */
> 	public EClass getConstructorDeclaration() {
> 		if (constructorDeclarationEClass == null) {
>-			constructorDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(28);
>+			constructorDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(30);
> 		}
> 		return constructorDeclarationEClass;
> 	}
>@@ -1889,7 +1992,7 @@
> 	 */
> 	public EClass getConditionalExpression() {
> 		if (conditionalExpressionEClass == null) {
>-			conditionalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(29);
>+			conditionalExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(31);
> 		}
> 		return conditionalExpressionEClass;
> 	}
>@@ -1928,7 +2031,7 @@
> 	 */
> 	public EClass getConstructorInvocation() {
> 		if (constructorInvocationEClass == null) {
>-			constructorInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(30);
>+			constructorInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(32);
> 		}
> 		return constructorInvocationEClass;
> 	}
>@@ -1940,7 +2043,7 @@
> 	 */
> 	public EClass getClassDeclaration() {
> 		if (classDeclarationEClass == null) {
>-			classDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(31);
>+			classDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(33);
> 		}
> 		return classDeclarationEClass;
> 	}
>@@ -1961,7 +2064,7 @@
> 	 */
> 	public EClass getComment() {
> 		if (commentEClass == null) {
>-			commentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(32);
>+			commentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(34);
> 		}
> 		return commentEClass;
> 	}
>@@ -2000,7 +2103,7 @@
> 	 */
> 	public EClass getCompilationUnit() {
> 		if (compilationUnitEClass == null) {
>-			compilationUnitEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(33);
>+			compilationUnitEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(35);
> 		}
> 		return compilationUnitEClass;
> 	}
>@@ -2057,7 +2160,7 @@
> 	 */
> 	public EClass getContinueStatement() {
> 		if (continueStatementEClass == null) {
>-			continueStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(34);
>+			continueStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(36);
> 		}
> 		return continueStatementEClass;
> 	}
>@@ -2078,7 +2181,7 @@
> 	 */
> 	public EClass getDoStatement() {
> 		if (doStatementEClass == null) {
>-			doStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(35);
>+			doStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(37);
> 		}
> 		return doStatementEClass;
> 	}
>@@ -2108,7 +2211,7 @@
> 	 */
> 	public EClass getEmptyStatement() {
> 		if (emptyStatementEClass == null) {
>-			emptyStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(36);
>+			emptyStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(38);
> 		}
> 		return emptyStatementEClass;
> 	}
>@@ -2120,7 +2223,7 @@
> 	 */
> 	public EClass getEnhancedForStatement() {
> 		if (enhancedForStatementEClass == null) {
>-			enhancedForStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(37);
>+			enhancedForStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(39);
> 		}
> 		return enhancedForStatementEClass;
> 	}
>@@ -2159,7 +2262,7 @@
> 	 */
> 	public EClass getEnumConstantDeclaration() {
> 		if (enumConstantDeclarationEClass == null) {
>-			enumConstantDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(38);
>+			enumConstantDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(40);
> 		}
> 		return enumConstantDeclarationEClass;
> 	}
>@@ -2189,7 +2292,7 @@
> 	 */
> 	public EClass getEnumDeclaration() {
> 		if (enumDeclarationEClass == null) {
>-			enumDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(39);
>+			enumDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(41);
> 		}
> 		return enumDeclarationEClass;
> 	}
>@@ -2210,7 +2313,7 @@
> 	 */
> 	public EClass getExpression() {
> 		if (expressionEClass == null) {
>-			expressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(40);
>+			expressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(42);
> 		}
> 		return expressionEClass;
> 	}
>@@ -2222,7 +2325,7 @@
> 	 */
> 	public EClass getExpressionStatement() {
> 		if (expressionStatementEClass == null) {
>-			expressionStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(41);
>+			expressionStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(43);
> 		}
> 		return expressionStatementEClass;
> 	}
>@@ -2243,7 +2346,7 @@
> 	 */
> 	public EClass getFieldAccess() {
> 		if (fieldAccessEClass == null) {
>-			fieldAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(42);
>+			fieldAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(44);
> 		}
> 		return fieldAccessEClass;
> 	}
>@@ -2273,7 +2376,7 @@
> 	 */
> 	public EClass getFieldDeclaration() {
> 		if (fieldDeclarationEClass == null) {
>-			fieldDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(43);
>+			fieldDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(45);
> 		}
> 		return fieldDeclarationEClass;
> 	}
>@@ -2285,7 +2388,7 @@
> 	 */
> 	public EClass getForStatement() {
> 		if (forStatementEClass == null) {
>-			forStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(44);
>+			forStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(46);
> 		}
> 		return forStatementEClass;
> 	}
>@@ -2333,7 +2436,7 @@
> 	 */
> 	public EClass getIfStatement() {
> 		if (ifStatementEClass == null) {
>-			ifStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(45);
>+			ifStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(47);
> 		}
> 		return ifStatementEClass;
> 	}
>@@ -2372,7 +2475,7 @@
> 	 */
> 	public EClass getImportDeclaration() {
> 		if (importDeclarationEClass == null) {
>-			importDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(46);
>+			importDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(48);
> 		}
> 		return importDeclarationEClass;
> 	}
>@@ -2402,7 +2505,7 @@
> 	 */
> 	public EClass getInfixExpression() {
> 		if (infixExpressionEClass == null) {
>-			infixExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(47);
>+			infixExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(49);
> 		}
> 		return infixExpressionEClass;
> 	}
>@@ -2450,7 +2553,7 @@
> 	 */
> 	public EClass getInitializer() {
> 		if (initializerEClass == null) {
>-			initializerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(50);
>+			initializerEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(52);
> 		}
> 		return initializerEClass;
> 	}
>@@ -2471,7 +2574,7 @@
> 	 */
> 	public EClass getInstanceofExpression() {
> 		if (instanceofExpressionEClass == null) {
>-			instanceofExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(51);
>+			instanceofExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(53);
> 		}
> 		return instanceofExpressionEClass;
> 	}
>@@ -2501,7 +2604,7 @@
> 	 */
> 	public EClass getInterfaceDeclaration() {
> 		if (interfaceDeclarationEClass == null) {
>-			interfaceDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(52);
>+			interfaceDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(54);
> 		}
> 		return interfaceDeclarationEClass;
> 	}
>@@ -2513,7 +2616,7 @@
> 	 */
> 	public EClass getJavadoc() {
> 		if (javadocEClass == null) {
>-			javadocEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(53);
>+			javadocEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(55);
> 		}
> 		return javadocEClass;
> 	}
>@@ -2534,7 +2637,7 @@
> 	 */
> 	public EClass getLabeledStatement() {
> 		if (labeledStatementEClass == null) {
>-			labeledStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(54);
>+			labeledStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(56);
> 		}
> 		return labeledStatementEClass;
> 	}
>@@ -2573,7 +2676,7 @@
> 	 */
> 	public EClass getLineComment() {
> 		if (lineCommentEClass == null) {
>-			lineCommentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(55);
>+			lineCommentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(57);
> 		}
> 		return lineCommentEClass;
> 	}
>@@ -2583,9 +2686,99 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getManifest() {
>+		if (manifestEClass == null) {
>+			manifestEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(58);
>+		}
>+		return manifestEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getManifest_MainAttributes() {
>+ return (EReference)getManifest().getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getManifest_EntryAttributes() {
>+ return (EReference)getManifest().getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getManifestAttribute() {
>+		if (manifestAttributeEClass == null) {
>+			manifestAttributeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(59);
>+		}
>+		return manifestAttributeEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getManifestAttribute_Key() {
>+ return (EAttribute)getManifestAttribute().getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getManifestAttribute_Value() {
>+ return (EAttribute)getManifestAttribute().getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EClass getManifestEntry() {
>+		if (manifestEntryEClass == null) {
>+			manifestEntryEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(60);
>+		}
>+		return manifestEntryEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EAttribute getManifestEntry_Name() {
>+ return (EAttribute)getManifestEntry().getEStructuralFeatures().get(0);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getManifestEntry_Attributes() {
>+ return (EReference)getManifestEntry().getEStructuralFeatures().get(1);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getMemberRef() {
> 		if (memberRefEClass == null) {
>-			memberRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(56);
>+			memberRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(61);
> 		}
> 		return memberRefEClass;
> 	}
>@@ -2615,7 +2808,7 @@
> 	 */
> 	public EClass getMethodDeclaration() {
> 		if (methodDeclarationEClass == null) {
>-			methodDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(57);
>+			methodDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(62);
> 		}
> 		return methodDeclarationEClass;
> 	}
>@@ -2663,7 +2856,7 @@
> 	 */
> 	public EClass getMethodInvocation() {
> 		if (methodInvocationEClass == null) {
>-			methodInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(58);
>+			methodInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(63);
> 		}
> 		return methodInvocationEClass;
> 	}
>@@ -2684,7 +2877,7 @@
> 	 */
> 	public EClass getMethodRef() {
> 		if (methodRefEClass == null) {
>-			methodRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(59);
>+			methodRefEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(64);
> 		}
> 		return methodRefEClass;
> 	}
>@@ -2723,7 +2916,7 @@
> 	 */
> 	public EClass getMethodRefParameter() {
> 		if (methodRefParameterEClass == null) {
>-			methodRefParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(60);
>+			methodRefParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(65);
> 		}
> 		return methodRefParameterEClass;
> 	}
>@@ -2762,7 +2955,7 @@
> 	 */
> 	public EClass getModel() {
> 		if (modelEClass == null) {
>-			modelEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(61);
>+			modelEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(66);
> 		}
> 		return modelEClass;
> 	}
>@@ -2817,9 +3010,27 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EReference getModel_ClassFiles() {
>+ return (EReference)getModel().getEStructuralFeatures().get(5);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EReference getModel_Archives() {
>+ return (EReference)getModel().getEStructuralFeatures().get(6);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getModifier() {
> 		if (modifierEClass == null) {
>-			modifierEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(62);
>+			modifierEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(67);
> 		}
> 		return modifierEClass;
> 	}
>@@ -2939,7 +3150,7 @@
> 	 */
> 	public EClass getNamedElement() {
> 		if (namedElementEClass == null) {
>-			namedElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(63);
>+			namedElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(68);
> 		}
> 		return namedElementEClass;
> 	}
>@@ -2976,9 +3187,21 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EClass getNamespaceAccess() {
>+		if (namespaceAccessEClass == null) {
>+			namespaceAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(69);
>+		}
>+		return namespaceAccessEClass;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public EClass getNumberLiteral() {
> 		if (numberLiteralEClass == null) {
>-			numberLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(64);
>+			numberLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(70);
> 		}
> 		return numberLiteralEClass;
> 	}
>@@ -2999,7 +3222,7 @@
> 	 */
> 	public EClass getNullLiteral() {
> 		if (nullLiteralEClass == null) {
>-			nullLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(65);
>+			nullLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(71);
> 		}
> 		return nullLiteralEClass;
> 	}
>@@ -3011,7 +3234,7 @@
> 	 */
> 	public EClass getPackage() {
> 		if (packageEClass == null) {
>-			packageEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(66);
>+			packageEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(72);
> 		}
> 		return packageEClass;
> 	}
>@@ -3021,17 +3244,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getPackage_QualifiedName() {
>- return (EAttribute)getPackage().getEStructuralFeatures().get(0);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EReference getPackage_OwnedElements() {
>- return (EReference)getPackage().getEStructuralFeatures().get(1);
>+ return (EReference)getPackage().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -3040,7 +3254,7 @@
> 	 * @generated
> 	 */
> 	public EReference getPackage_Model() {
>- return (EReference)getPackage().getEStructuralFeatures().get(2);
>+ return (EReference)getPackage().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -3049,7 +3263,7 @@
> 	 * @generated
> 	 */
> 	public EReference getPackage_OwnedPackages() {
>- return (EReference)getPackage().getEStructuralFeatures().get(3);
>+ return (EReference)getPackage().getEStructuralFeatures().get(2);
> 	}
> 
> 	/**
>@@ -3058,7 +3272,7 @@
> 	 * @generated
> 	 */
> 	public EReference getPackage_Package() {
>- return (EReference)getPackage().getEStructuralFeatures().get(4);
>+ return (EReference)getPackage().getEStructuralFeatures().get(3);
> 	}
> 
> 	/**
>@@ -3067,7 +3281,7 @@
> 	 * @generated
> 	 */
> 	public EReference getPackage_UsagesInPackageAccess() {
>- return (EReference)getPackage().getEStructuralFeatures().get(5);
>+ return (EReference)getPackage().getEStructuralFeatures().get(4);
> 	}
> 
> 	/**
>@@ -3077,7 +3291,7 @@
> 	 */
> 	public EClass getPackageAccess() {
> 		if (packageAccessEClass == null) {
>-			packageAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(67);
>+			packageAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(73);
> 		}
> 		return packageAccessEClass;
> 	}
>@@ -3107,7 +3321,7 @@
> 	 */
> 	public EClass getParameterizedType() {
> 		if (parameterizedTypeEClass == null) {
>-			parameterizedTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(68);
>+			parameterizedTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(74);
> 		}
> 		return parameterizedTypeEClass;
> 	}
>@@ -3117,17 +3331,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getParameterizedType_QualifiedName() {
>- return (EAttribute)getParameterizedType().getEStructuralFeatures().get(0);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EReference getParameterizedType_Type() {
>- return (EReference)getParameterizedType().getEStructuralFeatures().get(1);
>+ return (EReference)getParameterizedType().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -3136,7 +3341,7 @@
> 	 * @generated
> 	 */
> 	public EReference getParameterizedType_TypeArguments() {
>- return (EReference)getParameterizedType().getEStructuralFeatures().get(2);
>+ return (EReference)getParameterizedType().getEStructuralFeatures().get(1);
> 	}
> 
> 	/**
>@@ -3146,7 +3351,7 @@
> 	 */
> 	public EClass getParenthesizedExpression() {
> 		if (parenthesizedExpressionEClass == null) {
>-			parenthesizedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(69);
>+			parenthesizedExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(75);
> 		}
> 		return parenthesizedExpressionEClass;
> 	}
>@@ -3167,7 +3372,7 @@
> 	 */
> 	public EClass getPostfixExpression() {
> 		if (postfixExpressionEClass == null) {
>-			postfixExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(70);
>+			postfixExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(76);
> 		}
> 		return postfixExpressionEClass;
> 	}
>@@ -3197,7 +3402,7 @@
> 	 */
> 	public EClass getPrefixExpression() {
> 		if (prefixExpressionEClass == null) {
>-			prefixExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(72);
>+			prefixExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(78);
> 		}
> 		return prefixExpressionEClass;
> 	}
>@@ -3227,7 +3432,7 @@
> 	 */
> 	public EClass getPrimitiveType() {
> 		if (primitiveTypeEClass == null) {
>-			primitiveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(74);
>+			primitiveTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(80);
> 		}
> 		return primitiveTypeEClass;
> 	}
>@@ -3239,7 +3444,7 @@
> 	 */
> 	public EClass getPrimitiveTypeBoolean() {
> 		if (primitiveTypeBooleanEClass == null) {
>-			primitiveTypeBooleanEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(75);
>+			primitiveTypeBooleanEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(81);
> 		}
> 		return primitiveTypeBooleanEClass;
> 	}
>@@ -3251,7 +3456,7 @@
> 	 */
> 	public EClass getPrimitiveTypeByte() {
> 		if (primitiveTypeByteEClass == null) {
>-			primitiveTypeByteEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(76);
>+			primitiveTypeByteEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(82);
> 		}
> 		return primitiveTypeByteEClass;
> 	}
>@@ -3263,7 +3468,7 @@
> 	 */
> 	public EClass getPrimitiveTypeChar() {
> 		if (primitiveTypeCharEClass == null) {
>-			primitiveTypeCharEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(77);
>+			primitiveTypeCharEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(83);
> 		}
> 		return primitiveTypeCharEClass;
> 	}
>@@ -3275,7 +3480,7 @@
> 	 */
> 	public EClass getPrimitiveTypeDouble() {
> 		if (primitiveTypeDoubleEClass == null) {
>-			primitiveTypeDoubleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(78);
>+			primitiveTypeDoubleEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(84);
> 		}
> 		return primitiveTypeDoubleEClass;
> 	}
>@@ -3287,7 +3492,7 @@
> 	 */
> 	public EClass getPrimitiveTypeShort() {
> 		if (primitiveTypeShortEClass == null) {
>-			primitiveTypeShortEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(79);
>+			primitiveTypeShortEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(85);
> 		}
> 		return primitiveTypeShortEClass;
> 	}
>@@ -3299,7 +3504,7 @@
> 	 */
> 	public EClass getPrimitiveTypeFloat() {
> 		if (primitiveTypeFloatEClass == null) {
>-			primitiveTypeFloatEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(80);
>+			primitiveTypeFloatEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(86);
> 		}
> 		return primitiveTypeFloatEClass;
> 	}
>@@ -3311,7 +3516,7 @@
> 	 */
> 	public EClass getPrimitiveTypeInt() {
> 		if (primitiveTypeIntEClass == null) {
>-			primitiveTypeIntEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(81);
>+			primitiveTypeIntEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(87);
> 		}
> 		return primitiveTypeIntEClass;
> 	}
>@@ -3323,7 +3528,7 @@
> 	 */
> 	public EClass getPrimitiveTypeLong() {
> 		if (primitiveTypeLongEClass == null) {
>-			primitiveTypeLongEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(82);
>+			primitiveTypeLongEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(88);
> 		}
> 		return primitiveTypeLongEClass;
> 	}
>@@ -3335,7 +3540,7 @@
> 	 */
> 	public EClass getPrimitiveTypeVoid() {
> 		if (primitiveTypeVoidEClass == null) {
>-			primitiveTypeVoidEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(83);
>+			primitiveTypeVoidEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(89);
> 		}
> 		return primitiveTypeVoidEClass;
> 	}
>@@ -3347,7 +3552,7 @@
> 	 */
> 	public EClass getReturnStatement() {
> 		if (returnStatementEClass == null) {
>-			returnStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(84);
>+			returnStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(90);
> 		}
> 		return returnStatementEClass;
> 	}
>@@ -3368,7 +3573,7 @@
> 	 */
> 	public EClass getSingleVariableAccess() {
> 		if (singleVariableAccessEClass == null) {
>-			singleVariableAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(85);
>+			singleVariableAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(91);
> 		}
> 		return singleVariableAccessEClass;
> 	}
>@@ -3398,7 +3603,7 @@
> 	 */
> 	public EClass getSingleVariableDeclaration() {
> 		if (singleVariableDeclarationEClass == null) {
>-			singleVariableDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(86);
>+			singleVariableDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(92);
> 		}
> 		return singleVariableDeclarationEClass;
> 	}
>@@ -3473,7 +3678,7 @@
> 	 */
> 	public EClass getStatement() {
> 		if (statementEClass == null) {
>-			statementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(87);
>+			statementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(93);
> 		}
> 		return statementEClass;
> 	}
>@@ -3485,7 +3690,7 @@
> 	 */
> 	public EClass getStringLiteral() {
> 		if (stringLiteralEClass == null) {
>-			stringLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(88);
>+			stringLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(94);
> 		}
> 		return stringLiteralEClass;
> 	}
>@@ -3506,7 +3711,7 @@
> 	 */
> 	public EClass getSuperConstructorInvocation() {
> 		if (superConstructorInvocationEClass == null) {
>-			superConstructorInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(89);
>+			superConstructorInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(95);
> 		}
> 		return superConstructorInvocationEClass;
> 	}
>@@ -3527,7 +3732,7 @@
> 	 */
> 	public EClass getSuperFieldAccess() {
> 		if (superFieldAccessEClass == null) {
>-			superFieldAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(90);
>+			superFieldAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(96);
> 		}
> 		return superFieldAccessEClass;
> 	}
>@@ -3548,7 +3753,7 @@
> 	 */
> 	public EClass getSuperMethodInvocation() {
> 		if (superMethodInvocationEClass == null) {
>-			superMethodInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(91);
>+			superMethodInvocationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(97);
> 		}
> 		return superMethodInvocationEClass;
> 	}
>@@ -3560,7 +3765,7 @@
> 	 */
> 	public EClass getSwitchCase() {
> 		if (switchCaseEClass == null) {
>-			switchCaseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(92);
>+			switchCaseEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(98);
> 		}
> 		return switchCaseEClass;
> 	}
>@@ -3590,7 +3795,7 @@
> 	 */
> 	public EClass getSwitchStatement() {
> 		if (switchStatementEClass == null) {
>-			switchStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(93);
>+			switchStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(99);
> 		}
> 		return switchStatementEClass;
> 	}
>@@ -3620,7 +3825,7 @@
> 	 */
> 	public EClass getSynchronizedStatement() {
> 		if (synchronizedStatementEClass == null) {
>-			synchronizedStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(94);
>+			synchronizedStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(100);
> 		}
> 		return synchronizedStatementEClass;
> 	}
>@@ -3650,7 +3855,7 @@
> 	 */
> 	public EClass getTagElement() {
> 		if (tagElementEClass == null) {
>-			tagElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(95);
>+			tagElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(101);
> 		}
> 		return tagElementEClass;
> 	}
>@@ -3680,7 +3885,7 @@
> 	 */
> 	public EClass getTextElement() {
> 		if (textElementEClass == null) {
>-			textElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(96);
>+			textElementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(102);
> 		}
> 		return textElementEClass;
> 	}
>@@ -3701,7 +3906,7 @@
> 	 */
> 	public EClass getThisExpression() {
> 		if (thisExpressionEClass == null) {
>-			thisExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(97);
>+			thisExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(103);
> 		}
> 		return thisExpressionEClass;
> 	}
>@@ -3713,7 +3918,7 @@
> 	 */
> 	public EClass getThrowStatement() {
> 		if (throwStatementEClass == null) {
>-			throwStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(98);
>+			throwStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(104);
> 		}
> 		return throwStatementEClass;
> 	}
>@@ -3734,7 +3939,7 @@
> 	 */
> 	public EClass getTryStatement() {
> 		if (tryStatementEClass == null) {
>-			tryStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(99);
>+			tryStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(105);
> 		}
> 		return tryStatementEClass;
> 	}
>@@ -3773,7 +3978,7 @@
> 	 */
> 	public EClass getType() {
> 		if (typeEClass == null) {
>-			typeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(100);
>+			typeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(106);
> 		}
> 		return typeEClass;
> 	}
>@@ -3794,7 +3999,7 @@
> 	 */
> 	public EClass getTypeAccess() {
> 		if (typeAccessEClass == null) {
>-			typeAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(101);
>+			typeAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(107);
> 		}
> 		return typeAccessEClass;
> 	}
>@@ -3824,7 +4029,7 @@
> 	 */
> 	public EClass getTypeDeclaration() {
> 		if (typeDeclarationEClass == null) {
>-			typeDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(102);
>+			typeDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(108);
> 		}
> 		return typeDeclarationEClass;
> 	}
>@@ -3845,7 +4050,7 @@
> 	 */
> 	public EClass getTypeDeclarationStatement() {
> 		if (typeDeclarationStatementEClass == null) {
>-			typeDeclarationStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(103);
>+			typeDeclarationStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(109);
> 		}
> 		return typeDeclarationStatementEClass;
> 	}
>@@ -3866,7 +4071,7 @@
> 	 */
> 	public EClass getTypeLiteral() {
> 		if (typeLiteralEClass == null) {
>-			typeLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(104);
>+			typeLiteralEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(110);
> 		}
> 		return typeLiteralEClass;
> 	}
>@@ -3887,7 +4092,7 @@
> 	 */
> 	public EClass getTypeParameter() {
> 		if (typeParameterEClass == null) {
>-			typeParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(105);
>+			typeParameterEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(111);
> 		}
> 		return typeParameterEClass;
> 	}
>@@ -3908,7 +4113,7 @@
> 	 */
> 	public EClass getUnresolvedItem() {
> 		if (unresolvedItemEClass == null) {
>-			unresolvedItemEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(106);
>+			unresolvedItemEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(112);
> 		}
> 		return unresolvedItemEClass;
> 	}
>@@ -3920,7 +4125,7 @@
> 	 */
> 	public EClass getUnresolvedItemAccess() {
> 		if (unresolvedItemAccessEClass == null) {
>-			unresolvedItemAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(107);
>+			unresolvedItemAccessEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(113);
> 		}
> 		return unresolvedItemAccessEClass;
> 	}
>@@ -3950,7 +4155,7 @@
> 	 */
> 	public EClass getUnresolvedAnnotationDeclaration() {
> 		if (unresolvedAnnotationDeclarationEClass == null) {
>-			unresolvedAnnotationDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(108);
>+			unresolvedAnnotationDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(114);
> 		}
> 		return unresolvedAnnotationDeclarationEClass;
> 	}
>@@ -3962,7 +4167,7 @@
> 	 */
> 	public EClass getUnresolvedAnnotationTypeMemberDeclaration() {
> 		if (unresolvedAnnotationTypeMemberDeclarationEClass == null) {
>-			unresolvedAnnotationTypeMemberDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(109);
>+			unresolvedAnnotationTypeMemberDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(115);
> 		}
> 		return unresolvedAnnotationTypeMemberDeclarationEClass;
> 	}
>@@ -3974,7 +4179,7 @@
> 	 */
> 	public EClass getUnresolvedClassDeclaration() {
> 		if (unresolvedClassDeclarationEClass == null) {
>-			unresolvedClassDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(110);
>+			unresolvedClassDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(116);
> 		}
> 		return unresolvedClassDeclarationEClass;
> 	}
>@@ -3986,7 +4191,7 @@
> 	 */
> 	public EClass getUnresolvedEnumDeclaration() {
> 		if (unresolvedEnumDeclarationEClass == null) {
>-			unresolvedEnumDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(111);
>+			unresolvedEnumDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(117);
> 		}
> 		return unresolvedEnumDeclarationEClass;
> 	}
>@@ -3998,7 +4203,7 @@
> 	 */
> 	public EClass getUnresolvedInterfaceDeclaration() {
> 		if (unresolvedInterfaceDeclarationEClass == null) {
>-			unresolvedInterfaceDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(112);
>+			unresolvedInterfaceDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(118);
> 		}
> 		return unresolvedInterfaceDeclarationEClass;
> 	}
>@@ -4010,7 +4215,7 @@
> 	 */
> 	public EClass getUnresolvedLabeledStatement() {
> 		if (unresolvedLabeledStatementEClass == null) {
>-			unresolvedLabeledStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(113);
>+			unresolvedLabeledStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(119);
> 		}
> 		return unresolvedLabeledStatementEClass;
> 	}
>@@ -4022,7 +4227,7 @@
> 	 */
> 	public EClass getUnresolvedMethodDeclaration() {
> 		if (unresolvedMethodDeclarationEClass == null) {
>-			unresolvedMethodDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(114);
>+			unresolvedMethodDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(120);
> 		}
> 		return unresolvedMethodDeclarationEClass;
> 	}
>@@ -4034,7 +4239,7 @@
> 	 */
> 	public EClass getUnresolvedSingleVariableDeclaration() {
> 		if (unresolvedSingleVariableDeclarationEClass == null) {
>-			unresolvedSingleVariableDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(115);
>+			unresolvedSingleVariableDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(121);
> 		}
> 		return unresolvedSingleVariableDeclarationEClass;
> 	}
>@@ -4046,7 +4251,7 @@
> 	 */
> 	public EClass getUnresolvedType() {
> 		if (unresolvedTypeEClass == null) {
>-			unresolvedTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(116);
>+			unresolvedTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(122);
> 		}
> 		return unresolvedTypeEClass;
> 	}
>@@ -4058,7 +4263,7 @@
> 	 */
> 	public EClass getUnresolvedTypeDeclaration() {
> 		if (unresolvedTypeDeclarationEClass == null) {
>-			unresolvedTypeDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(117);
>+			unresolvedTypeDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(123);
> 		}
> 		return unresolvedTypeDeclarationEClass;
> 	}
>@@ -4070,7 +4275,7 @@
> 	 */
> 	public EClass getUnresolvedVariableDeclarationFragment() {
> 		if (unresolvedVariableDeclarationFragmentEClass == null) {
>-			unresolvedVariableDeclarationFragmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(118);
>+			unresolvedVariableDeclarationFragmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(124);
> 		}
> 		return unresolvedVariableDeclarationFragmentEClass;
> 	}
>@@ -4082,7 +4287,7 @@
> 	 */
> 	public EClass getVariableDeclaration() {
> 		if (variableDeclarationEClass == null) {
>-			variableDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(119);
>+			variableDeclarationEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(125);
> 		}
> 		return variableDeclarationEClass;
> 	}
>@@ -4121,7 +4326,7 @@
> 	 */
> 	public EClass getVariableDeclarationExpression() {
> 		if (variableDeclarationExpressionEClass == null) {
>-			variableDeclarationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(120);
>+			variableDeclarationExpressionEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(126);
> 		}
> 		return variableDeclarationExpressionEClass;
> 	}
>@@ -4151,7 +4356,7 @@
> 	 */
> 	public EClass getVariableDeclarationFragment() {
> 		if (variableDeclarationFragmentEClass == null) {
>-			variableDeclarationFragmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(121);
>+			variableDeclarationFragmentEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(127);
> 		}
> 		return variableDeclarationFragmentEClass;
> 	}
>@@ -4161,17 +4366,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public EAttribute getVariableDeclarationFragment_QualifiedName() {
>- return (EAttribute)getVariableDeclarationFragment().getEStructuralFeatures().get(0);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public EReference getVariableDeclarationFragment_VariablesContainer() {
>- return (EReference)getVariableDeclarationFragment().getEStructuralFeatures().get(1);
>+ return (EReference)getVariableDeclarationFragment().getEStructuralFeatures().get(0);
> 	}
> 
> 	/**
>@@ -4181,7 +4377,7 @@
> 	 */
> 	public EClass getVariableDeclarationStatement() {
> 		if (variableDeclarationStatementEClass == null) {
>-			variableDeclarationStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(122);
>+			variableDeclarationStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(128);
> 		}
> 		return variableDeclarationStatementEClass;
> 	}
>@@ -4220,7 +4416,7 @@
> 	 */
> 	public EClass getWildCardType() {
> 		if (wildCardTypeEClass == null) {
>-			wildCardTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(124);
>+			wildCardTypeEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(130);
> 		}
> 		return wildCardTypeEClass;
> 	}
>@@ -4250,7 +4446,7 @@
> 	 */
> 	public EClass getWhileStatement() {
> 		if (whileStatementEClass == null) {
>-			whileStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(125);
>+			whileStatementEClass = (EClass)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(131);
> 		}
> 		return whileStatementEClass;
> 	}
>@@ -4280,7 +4476,7 @@
> 	 */
> 	public EEnum getAssignmentKind() {
> 		if (assignmentKindEEnum == null) {
>-			assignmentKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(18);
>+			assignmentKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(19);
> 		}
> 		return assignmentKindEEnum;
> 	}
>@@ -4292,7 +4488,7 @@
> 	 */
> 	public EEnum getInfixExpressionKind() {
> 		if (infixExpressionKindEEnum == null) {
>-			infixExpressionKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(48);
>+			infixExpressionKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(50);
> 		}
> 		return infixExpressionKindEEnum;
> 	}
>@@ -4304,7 +4500,7 @@
> 	 */
> 	public EEnum getInheritanceKind() {
> 		if (inheritanceKindEEnum == null) {
>-			inheritanceKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(49);
>+			inheritanceKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(51);
> 		}
> 		return inheritanceKindEEnum;
> 	}
>@@ -4316,7 +4512,7 @@
> 	 */
> 	public EEnum getPostfixExpressionKind() {
> 		if (postfixExpressionKindEEnum == null) {
>-			postfixExpressionKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(71);
>+			postfixExpressionKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(77);
> 		}
> 		return postfixExpressionKindEEnum;
> 	}
>@@ -4328,7 +4524,7 @@
> 	 */
> 	public EEnum getPrefixExpressionKind() {
> 		if (prefixExpressionKindEEnum == null) {
>-			prefixExpressionKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(73);
>+			prefixExpressionKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(79);
> 		}
> 		return prefixExpressionKindEEnum;
> 	}
>@@ -4340,7 +4536,7 @@
> 	 */
> 	public EEnum getVisibilityKind() {
> 		if (visibilityKindEEnum == null) {
>-			visibilityKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(123);
>+			visibilityKindEEnum = (EEnum)EPackage.Registry.INSTANCE.getEPackage(JavaPackage.eNS_URI).getEClassifiers().get(129);
> 		}
> 		return visibilityKindEEnum;
> 	}
>@@ -4373,7 +4569,7 @@
> 
> 		URL url = getClass().getResource(packageFilename);
> 		if (url == null) {
>-			throw new RuntimeException("Missing serialized package: " + packageFilename);
>+			throw new RuntimeException("Missing serialized package: " + packageFilename); //$NON-NLS-1$
> 		}
> 		URI uri = URI.createURI(url.toString());
> 		Resource resource = new EcoreResourceFactoryImpl().createResource(uri);
>@@ -4416,7 +4612,7 @@
> 	@Override
> 	protected void fixInstanceClass(EClassifier eClassifier) {
> 		if (eClassifier.getInstanceClassName() == null) {
>-			eClassifier.setInstanceClassName("org.eclipse.gmt.modisco.java." + eClassifier.getName());
>+			eClassifier.setInstanceClassName("org.eclipse.gmt.modisco.java." + eClassifier.getName()); //$NON-NLS-1$
> 			setGeneratedClassName(eClassifier);
> 		}
> 	}
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java	(working copy)
>@@ -35,7 +35,6 @@
> import org.eclipse.gmt.modisco.java.Model;
> import org.eclipse.gmt.modisco.java.PackageAccess;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>-import org.eclipse.gmt.modisco.java.emf.util.JavaUtil;
> 
> /**
> * 
>@@ -44,7 +43,6 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.PackageImpl#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.PackageImpl#getOwnedElements Owned Elements}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.PackageImpl#getModel Model}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.PackageImpl#getOwnedPackages Owned Packages}</li>
>@@ -57,16 +55,6 @@
> */
> public class PackageImpl extends NamedElementImpl implements org.eclipse.gmt.modisco.java.Package {
> 	/**
>-	 * The default value of the '{@link #getQualifiedName() Qualified Name}' attribute.
>-	 * 
>-	 * 
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String QUALIFIED_NAME_EDEFAULT = null;
>-
>-	/**
> 	 * The cached value of the '{@link #getOwnedElements() Owned Elements}' containment reference list.
> 	 * 
> 	 * 
>@@ -118,16 +106,6 @@
> 	/**
> 	 * 
> 	 * 
>-	 * 
>-	 */
>-	public String getQualifiedName() {
>-		return JavaUtil.getQualifiedName(this);
>-
>-	}
>-
>-	/**
>-	 * 
>-	 * 
> 	 * @generated
> 	 */
> 	public EList<AbstractTypeDeclaration> getOwnedElements() {
>@@ -165,7 +143,7 @@
> 	public void setModel(Model newModel) {
> 		if (newModel != eInternalContainer() || (eContainerFeatureID() != JavaPackage.PACKAGE__MODEL && newModel != null)) {
> 			if (EcoreUtil.isAncestor(this, newModel))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -218,7 +196,7 @@
> 	public void setPackage(org.eclipse.gmt.modisco.java.Package newPackage) {
> 		if (newPackage != eInternalContainer() || (eContainerFeatureID() != JavaPackage.PACKAGE__PACKAGE && newPackage != null)) {
> 			if (EcoreUtil.isAncestor(this, newPackage))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -316,8 +294,6 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>-			case JavaPackage.PACKAGE__QUALIFIED_NAME:
>-				return getQualifiedName();
> 			case JavaPackage.PACKAGE__OWNED_ELEMENTS:
> 				return getOwnedElements();
> 			case JavaPackage.PACKAGE__MODEL:
>@@ -398,8 +374,6 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>-			case JavaPackage.PACKAGE__QUALIFIED_NAME:
>-				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
> 			case JavaPackage.PACKAGE__OWNED_ELEMENTS:
> 				return ownedElements != null && !ownedElements.isEmpty();
> 			case JavaPackage.PACKAGE__MODEL:
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -363,7 +364,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (operator: ");
>+		result.append(" (operator: "); //$NON-NLS-1$
> 		result.append(operator);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java	(revision 0)
>@@ -0,0 +1,237 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java.emf.impl;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.gmt.modisco.java.ManifestAttribute;
>+
>+import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Manifest Attribute'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestAttributeImpl#getKey Key}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestAttributeImpl#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ManifestAttributeImpl extends MinimalEObjectImpl.Container implements ManifestAttribute {
>+	/**
>+	 * The default value of the '{@link #getKey() Key}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getKey()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String KEY_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getKey() Key}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getKey()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String key = KEY_EDEFAULT;
>+
>+	/**
>+	 * The default value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String VALUE_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getValue() Value}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getValue()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String value = VALUE_EDEFAULT;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ManifestAttributeImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaPackage.eINSTANCE.getManifestAttribute();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getKey() {
>+		return key;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setKey(String newKey) {
>+		String oldKey = key;
>+		key = newKey;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.MANIFEST_ATTRIBUTE__KEY, oldKey, key));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getValue() {
>+		return value;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setValue(String newValue) {
>+		String oldValue = value;
>+		value = newValue;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.MANIFEST_ATTRIBUTE__VALUE, oldValue, value));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ATTRIBUTE__KEY:
>+				return getKey();
>+			case JavaPackage.MANIFEST_ATTRIBUTE__VALUE:
>+				return getValue();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ATTRIBUTE__KEY:
>+				setKey((String)newValue);
>+				return;
>+			case JavaPackage.MANIFEST_ATTRIBUTE__VALUE:
>+				setValue((String)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ATTRIBUTE__KEY:
>+				setKey(KEY_EDEFAULT);
>+				return;
>+			case JavaPackage.MANIFEST_ATTRIBUTE__VALUE:
>+				setValue(VALUE_EDEFAULT);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST_ATTRIBUTE__KEY:
>+				return KEY_EDEFAULT == null ? key != null : !KEY_EDEFAULT.equals(key);
>+			case JavaPackage.MANIFEST_ATTRIBUTE__VALUE:
>+				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (key: "); //$NON-NLS-1$
>+		result.append(key);
>+		result.append(", value: "); //$NON-NLS-1$
>+		result.append(value);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ManifestAttributeImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -171,7 +172,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (escapedValue: ");
>+		result.append(" (escapedValue: "); //$NON-NLS-1$
> 		result.append(escapedValue);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -399,7 +400,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (extraArrayDimensions: ");
>+		result.append(" (extraArrayDimensions: "); //$NON-NLS-1$
> 		result.append(extraArrayDimensions);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -33,6 +34,7 @@
> import org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration;
> import org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration;
> import org.eclipse.gmt.modisco.java.AnonymousClassDeclaration;
>+import org.eclipse.gmt.modisco.java.Archive;
> import org.eclipse.gmt.modisco.java.ArrayAccess;
> import org.eclipse.gmt.modisco.java.ArrayCreation;
> import org.eclipse.gmt.modisco.java.ArrayInitializer;
>@@ -49,6 +51,7 @@
> import org.eclipse.gmt.modisco.java.CatchClause;
> import org.eclipse.gmt.modisco.java.CharacterLiteral;
> import org.eclipse.gmt.modisco.java.ClassDeclaration;
>+import org.eclipse.gmt.modisco.java.ClassFile;
> import org.eclipse.gmt.modisco.java.ClassInstanceCreation;
> import org.eclipse.gmt.modisco.java.CompilationUnit;
> import org.eclipse.gmt.modisco.java.ConditionalExpression;
>@@ -75,6 +78,9 @@
> import org.eclipse.gmt.modisco.java.Javadoc;
> import org.eclipse.gmt.modisco.java.LabeledStatement;
> import org.eclipse.gmt.modisco.java.LineComment;
>+import org.eclipse.gmt.modisco.java.Manifest;
>+import org.eclipse.gmt.modisco.java.ManifestAttribute;
>+import org.eclipse.gmt.modisco.java.ManifestEntry;
> import org.eclipse.gmt.modisco.java.MemberRef;
> import org.eclipse.gmt.modisco.java.MethodDeclaration;
> import org.eclipse.gmt.modisco.java.MethodInvocation;
>@@ -158,7 +164,7 @@
> 	 */
> 	public static JavaFactory init() {
> 		try {
>-			JavaFactory theJavaFactory = (JavaFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/MoDisco/Java"); 
>+			JavaFactory theJavaFactory = (JavaFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/MoDisco/Java/0.2.incubation/java"); //$NON-NLS-1$
> 			if (theJavaFactory != null) {
> 				return theJavaFactory;
> 			}
>@@ -188,6 +194,7 @@
> 	public EObject create(EClass eClass) {
> 		switch (eClass.getClassifierID()) {
> 			case JavaPackage.ANNOTATION: return createAnnotation();
>+			case JavaPackage.ARCHIVE: return createArchive();
> 			case JavaPackage.ASSERT_STATEMENT: return createAssertStatement();
> 			case JavaPackage.ANNOTATION_MEMBER_VALUE_PAIR: return createAnnotationMemberValuePair();
> 			case JavaPackage.ANNOTATION_TYPE_DECLARATION: return createAnnotationTypeDeclaration();
>@@ -206,6 +213,7 @@
> 			case JavaPackage.CAST_EXPRESSION: return createCastExpression();
> 			case JavaPackage.CATCH_CLAUSE: return createCatchClause();
> 			case JavaPackage.CHARACTER_LITERAL: return createCharacterLiteral();
>+			case JavaPackage.CLASS_FILE: return createClassFile();
> 			case JavaPackage.CLASS_INSTANCE_CREATION: return createClassInstanceCreation();
> 			case JavaPackage.CONSTRUCTOR_DECLARATION: return createConstructorDeclaration();
> 			case JavaPackage.CONDITIONAL_EXPRESSION: return createConditionalExpression();
>@@ -231,6 +239,9 @@
> 			case JavaPackage.JAVADOC: return createJavadoc();
> 			case JavaPackage.LABELED_STATEMENT: return createLabeledStatement();
> 			case JavaPackage.LINE_COMMENT: return createLineComment();
>+			case JavaPackage.MANIFEST: return createManifest();
>+			case JavaPackage.MANIFEST_ATTRIBUTE: return createManifestAttribute();
>+			case JavaPackage.MANIFEST_ENTRY: return createManifestEntry();
> 			case JavaPackage.MEMBER_REF: return createMemberRef();
> 			case JavaPackage.METHOD_DECLARATION: return createMethodDeclaration();
> 			case JavaPackage.METHOD_INVOCATION: return createMethodInvocation();
>@@ -294,7 +305,7 @@
> 			case JavaPackage.WILD_CARD_TYPE: return createWildCardType();
> 			case JavaPackage.WHILE_STATEMENT: return createWhileStatement();
> 			default:
>-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
>+				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
> 	}
> 
>@@ -319,7 +330,7 @@
> 			case JavaPackage.VISIBILITY_KIND:
> 				return createVisibilityKindFromString(eDataType, initialValue);
> 			default:
>-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
> 	}
> 
>@@ -344,7 +355,7 @@
> 			case JavaPackage.VISIBILITY_KIND:
> 				return convertVisibilityKindToString(eDataType, instanceValue);
> 			default:
>-				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
>+				throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier"); //$NON-NLS-1$ //$NON-NLS-2$
> 		}
> 	}
> 
>@@ -363,6 +374,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public Archive createArchive() {
>+		ArchiveImpl archive = new ArchiveImpl();
>+		return archive;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public AssertStatement createAssertStatement() {
> 		AssertStatementImpl assertStatement = new AssertStatementImpl();
> 		return assertStatement;
>@@ -543,6 +564,16 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public ClassFile createClassFile() {
>+		ClassFileImpl classFile = new ClassFileImpl();
>+		return classFile;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public ClassInstanceCreation createClassInstanceCreation() {
> 		ClassInstanceCreationImpl classInstanceCreation = new ClassInstanceCreationImpl();
> 		return classInstanceCreation;
>@@ -793,6 +824,36 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public Manifest createManifest() {
>+		ManifestImpl manifest = new ManifestImpl();
>+		return manifest;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ManifestAttribute createManifestAttribute() {
>+		ManifestAttributeImpl manifestAttribute = new ManifestAttributeImpl();
>+		return manifestAttribute;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ManifestEntry createManifestEntry() {
>+		ManifestEntryImpl manifestEntry = new ManifestEntryImpl();
>+		return manifestEntry;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	public MemberRef createMemberRef() {
> 		MemberRefImpl memberRef = new MemberRefImpl();
> 		return memberRef;
>@@ -1415,7 +1476,7 @@
> 	 */
> 	public AssignmentKind createAssignmentKindFromString(EDataType eDataType, String initialValue) {
> 		AssignmentKind result = AssignmentKind.get(initialValue);
>-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		return result;
> 	}
> 
>@@ -1435,7 +1496,7 @@
> 	 */
> 	public InfixExpressionKind createInfixExpressionKindFromString(EDataType eDataType, String initialValue) {
> 		InfixExpressionKind result = InfixExpressionKind.get(initialValue);
>-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		return result;
> 	}
> 
>@@ -1455,7 +1516,7 @@
> 	 */
> 	public InheritanceKind createInheritanceKindFromString(EDataType eDataType, String initialValue) {
> 		InheritanceKind result = InheritanceKind.get(initialValue);
>-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		return result;
> 	}
> 
>@@ -1475,7 +1536,7 @@
> 	 */
> 	public PostfixExpressionKind createPostfixExpressionKindFromString(EDataType eDataType, String initialValue) {
> 		PostfixExpressionKind result = PostfixExpressionKind.get(initialValue);
>-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		return result;
> 	}
> 
>@@ -1495,7 +1556,7 @@
> 	 */
> 	public PrefixExpressionKind createPrefixExpressionKindFromString(EDataType eDataType, String initialValue) {
> 		PrefixExpressionKind result = PrefixExpressionKind.get(initialValue);
>-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		return result;
> 	}
> 
>@@ -1515,7 +1576,7 @@
> 	 */
> 	public VisibilityKind createVisibilityKindFromString(EDataType eDataType, String initialValue) {
> 		VisibilityKind result = VisibilityKind.get(initialValue);
>-		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
>+		if (result == null) throw new IllegalArgumentException("The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
> 		return result;
> 	}
> 
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -230,7 +231,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (tagName: ");
>+		result.append(" (tagName: "); //$NON-NLS-1$
> 		result.append(tagName);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -304,9 +305,9 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (name: ");
>+		result.append(" (name: "); //$NON-NLS-1$
> 		result.append(name);
>-		result.append(", varargs: ");
>+		result.append(", varargs: "); //$NON-NLS-1$
> 		result.append(varargs);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java	(working copy)
>@@ -21,17 +21,12 @@
> 
> 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.gmt.modisco.java.ArrayType;
> import org.eclipse.gmt.modisco.java.TypeAccess;
>-
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>-import org.eclipse.gmt.modisco.java.emf.util.JavaUtil;
> 
> /**
> * 
>@@ -40,7 +35,6 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ArrayTypeImpl#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ArrayTypeImpl#getDimensions Dimensions}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ArrayTypeImpl#getElementType Element Type}</li>
> * </ul>
>@@ -50,16 +44,6 @@
> */
> public class ArrayTypeImpl extends TypeImpl implements ArrayType {
> 	/**
>-	 * The default value of the '{@link #getQualifiedName() Qualified Name}' attribute.
>-	 * 
>-	 * 
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String QUALIFIED_NAME_EDEFAULT = null;
>-
>-	/**
> 	 * The default value of the '{@link #getDimensions() Dimensions}' attribute.
> 	 * 
> 	 * 
>@@ -108,15 +92,6 @@
> 		return JavaPackage.eINSTANCE.getArrayType();
> 	}
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 */
>-	public String getQualifiedName() {
>-		return JavaUtil.getQualifiedName(this);
>-
>-	}
> 
> 	/**
> 	 * 
>@@ -204,8 +179,6 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>-			case JavaPackage.ARRAY_TYPE__QUALIFIED_NAME:
>-				return getQualifiedName();
> 			case JavaPackage.ARRAY_TYPE__DIMENSIONS:
> 				return getDimensions();
> 			case JavaPackage.ARRAY_TYPE__ELEMENT_TYPE:
>@@ -258,8 +231,6 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>-			case JavaPackage.ARRAY_TYPE__QUALIFIED_NAME:
>-				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
> 			case JavaPackage.ARRAY_TYPE__DIMENSIONS:
> 				return dimensions != DIMENSIONS_EDEFAULT;
> 			case JavaPackage.ARRAY_TYPE__ELEMENT_TYPE:
>@@ -278,7 +249,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (dimensions: ");
>+		result.append(" (dimensions: "); //$NON-NLS-1$
> 		result.append(dimensions);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java	(working copy)
>@@ -32,7 +32,6 @@
> import org.eclipse.gmt.modisco.java.ParameterizedType;
> import org.eclipse.gmt.modisco.java.TypeAccess;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>-import org.eclipse.gmt.modisco.java.emf.util.JavaUtil;
> 
> /**
> * 
>@@ -41,7 +40,6 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ParameterizedTypeImpl#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ParameterizedTypeImpl#getType Type}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ParameterizedTypeImpl#getTypeArguments Type Arguments}</li>
> * </ul>
>@@ -51,16 +49,6 @@
> */
> public class ParameterizedTypeImpl extends TypeImpl implements ParameterizedType {
> 	/**
>-	 * The default value of the '{@link #getQualifiedName() Qualified Name}' attribute.
>-	 * 
>-	 * 
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String QUALIFIED_NAME_EDEFAULT = null;
>-
>-	/**
> 	 * The cached value of the '{@link #getType() Type}' containment reference.
> 	 * 
> 	 * 
>@@ -99,14 +87,6 @@
> 		return JavaPackage.eINSTANCE.getParameterizedType();
> 	}
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 */
>-	public String getQualifiedName() {
>-		return JavaUtil.getQualifiedName(this);
>-	}
> 
> 	/**
> 	 * 
>@@ -187,8 +167,6 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>-			case JavaPackage.PARAMETERIZED_TYPE__QUALIFIED_NAME:
>-				return getQualifiedName();
> 			case JavaPackage.PARAMETERIZED_TYPE__TYPE:
> 				return getType();
> 			case JavaPackage.PARAMETERIZED_TYPE__TYPE_ARGUMENTS:
>@@ -243,8 +221,6 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>-			case JavaPackage.PARAMETERIZED_TYPE__QUALIFIED_NAME:
>-				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
> 			case JavaPackage.PARAMETERIZED_TYPE__TYPE:
> 				return type != null;
> 			case JavaPackage.PARAMETERIZED_TYPE__TYPE_ARGUMENTS:
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -319,7 +320,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (operator: ");
>+		result.append(" (operator: "); //$NON-NLS-1$
> 		result.append(operator);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -275,11 +276,11 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (content: ");
>+		result.append(" (content: "); //$NON-NLS-1$
> 		result.append(content);
>-		result.append(", enclosedByParent: ");
>+		result.append(", enclosedByParent: "); //$NON-NLS-1$
> 		result.append(enclosedByParent);
>-		result.append(", prefixOfParent: ");
>+		result.append(", prefixOfParent: "); //$NON-NLS-1$
> 		result.append(prefixOfParent);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -26,7 +27,7 @@
> import org.eclipse.emf.ecore.InternalEObject;
> 
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
>-
>+import org.eclipse.gmt.modisco.java.ASTNode;
> import org.eclipse.gmt.modisco.java.Expression;
> import org.eclipse.gmt.modisco.java.UnresolvedItem;
> import org.eclipse.gmt.modisco.java.UnresolvedItemAccess;
>@@ -66,7 +67,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Expression qualifier;
>+	protected ASTNode qualifier;
> 
> 	/**
> 	 * 
>@@ -130,7 +131,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Expression getQualifier() {
>+	public ASTNode getQualifier() {
> 		return qualifier;
> 	}
> 
>@@ -139,8 +140,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public NotificationChain basicSetQualifier(Expression newQualifier, NotificationChain msgs) {
>-		Expression oldQualifier = qualifier;
>+	public NotificationChain basicSetQualifier(ASTNode newQualifier, NotificationChain msgs) {
>+		ASTNode oldQualifier = qualifier;
> 		qualifier = newQualifier;
> 		if (eNotificationRequired()) {
> 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaPackage.UNRESOLVED_ITEM_ACCESS__QUALIFIER, oldQualifier, newQualifier);
>@@ -154,7 +155,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setQualifier(Expression newQualifier) {
>+	public void setQualifier(ASTNode newQualifier) {
> 		if (newQualifier != qualifier) {
> 			NotificationChain msgs = null;
> 			if (qualifier != null)
>@@ -211,7 +212,7 @@
> 				setElement((UnresolvedItem)newValue);
> 				return;
> 			case JavaPackage.UNRESOLVED_ITEM_ACCESS__QUALIFIER:
>-				setQualifier((Expression)newValue);
>+				setQualifier((ASTNode)newValue);
> 				return;
> 		}
> 		super.eSet(featureID, newValue);
>@@ -229,7 +230,7 @@
> 				setElement((UnresolvedItem)null);
> 				return;
> 			case JavaPackage.UNRESOLVED_ITEM_ACCESS__QUALIFIER:
>-				setQualifier((Expression)null);
>+				setQualifier((ASTNode)null);
> 				return;
> 		}
> 		super.eUnset(featureID);
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -125,7 +126,7 @@
> 	public void setClassInstanceCreation(ClassInstanceCreation newClassInstanceCreation) {
> 		if (newClassInstanceCreation != eInternalContainer() || (eContainerFeatureID() != JavaPackage.ANONYMOUS_CLASS_DECLARATION__CLASS_INSTANCE_CREATION && newClassInstanceCreation != null)) {
> 			if (EcoreUtil.isAncestor(this, newClassInstanceCreation))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -26,7 +27,7 @@
> import org.eclipse.emf.ecore.InternalEObject;
> 
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
>-
>+import org.eclipse.gmt.modisco.java.NamespaceAccess;
> import org.eclipse.gmt.modisco.java.Expression;
> import org.eclipse.gmt.modisco.java.Type;
> import org.eclipse.gmt.modisco.java.TypeAccess;
>@@ -66,7 +67,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	protected Expression qualifier;
>+	protected NamespaceAccess qualifier;
> 
> 	/**
> 	 * 
>@@ -152,7 +153,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public Expression getQualifier() {
>+	public NamespaceAccess getQualifier() {
> 		return qualifier;
> 	}
> 
>@@ -161,8 +162,8 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public NotificationChain basicSetQualifier(Expression newQualifier, NotificationChain msgs) {
>-		Expression oldQualifier = qualifier;
>+	public NotificationChain basicSetQualifier(NamespaceAccess newQualifier, NotificationChain msgs) {
>+		NamespaceAccess oldQualifier = qualifier;
> 		qualifier = newQualifier;
> 		if (eNotificationRequired()) {
> 			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaPackage.TYPE_ACCESS__QUALIFIER, oldQualifier, newQualifier);
>@@ -176,7 +177,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public void setQualifier(Expression newQualifier) {
>+	public void setQualifier(NamespaceAccess newQualifier) {
> 		if (newQualifier != qualifier) {
> 			NotificationChain msgs = null;
> 			if (qualifier != null)
>@@ -251,7 +252,7 @@
> 				setType((Type)newValue);
> 				return;
> 			case JavaPackage.TYPE_ACCESS__QUALIFIER:
>-				setQualifier((Expression)newValue);
>+				setQualifier((NamespaceAccess)newValue);
> 				return;
> 		}
> 		super.eSet(featureID, newValue);
>@@ -269,7 +270,7 @@
> 				setType((Type)null);
> 				return;
> 			case JavaPackage.TYPE_ACCESS__QUALIFIER:
>-				setQualifier((Expression)null);
>+				setQualifier((NamespaceAccess)null);
> 				return;
> 		}
> 		super.eUnset(featureID);
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java	(revision 0)
>@@ -0,0 +1,304 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java.emf.impl;
>+
>+import java.util.Collection;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+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.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.gmt.modisco.java.Archive;
>+import org.eclipse.gmt.modisco.java.ClassFile;
>+
>+import org.eclipse.gmt.modisco.java.Manifest;
>+import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Archive'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ArchiveImpl#getOriginalFilePath Original File Path}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ArchiveImpl#getClassFiles Class Files}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ArchiveImpl#getManifest Manifest}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ArchiveImpl extends NamedElementImpl implements Archive {
>+	/**
>+	 * The default value of the '{@link #getOriginalFilePath() Original File Path}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getOriginalFilePath()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ORIGINAL_FILE_PATH_EDEFAULT = null;
>+	/**
>+	 * The cached value of the '{@link #getOriginalFilePath() Original File Path}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getOriginalFilePath()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String originalFilePath = ORIGINAL_FILE_PATH_EDEFAULT;
>+	/**
>+	 * The cached value of the '{@link #getClassFiles() Class Files}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getClassFiles()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ClassFile> classFiles;
>+
>+	/**
>+	 * The cached value of the '{@link #getManifest() Manifest}' containment reference.
>+	 * 
>+	 * 
>+	 * @see #getManifest()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected Manifest manifest;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ArchiveImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaPackage.eINSTANCE.getArchive();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getOriginalFilePath() {
>+		return originalFilePath;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setOriginalFilePath(String newOriginalFilePath) {
>+		String oldOriginalFilePath = originalFilePath;
>+		originalFilePath = newOriginalFilePath;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.ARCHIVE__ORIGINAL_FILE_PATH, oldOriginalFilePath, originalFilePath));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EList<ClassFile> getClassFiles() {
>+		if (classFiles == null) {
>+			classFiles = new EObjectContainmentEList<ClassFile>(ClassFile.class, this, JavaPackage.ARCHIVE__CLASS_FILES);
>+		}
>+		return classFiles;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public Manifest getManifest() {
>+		return manifest;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public NotificationChain basicSetManifest(Manifest newManifest, NotificationChain msgs) {
>+		Manifest oldManifest = manifest;
>+		manifest = newManifest;
>+		if (eNotificationRequired()) {
>+			ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, JavaPackage.ARCHIVE__MANIFEST, oldManifest, newManifest);
>+			if (msgs == null) msgs = notification; else msgs.add(notification);
>+		}
>+		return msgs;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setManifest(Manifest newManifest) {
>+		if (newManifest != manifest) {
>+			NotificationChain msgs = null;
>+			if (manifest != null)
>+				msgs = ((InternalEObject)manifest).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - JavaPackage.ARCHIVE__MANIFEST, null, msgs);
>+			if (newManifest != null)
>+				msgs = ((InternalEObject)newManifest).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - JavaPackage.ARCHIVE__MANIFEST, null, msgs);
>+			msgs = basicSetManifest(newManifest, msgs);
>+			if (msgs != null) msgs.dispatch();
>+		}
>+		else if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.ARCHIVE__MANIFEST, newManifest, newManifest));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JavaPackage.ARCHIVE__CLASS_FILES:
>+				return ((InternalEList<?>)getClassFiles()).basicRemove(otherEnd, msgs);
>+			case JavaPackage.ARCHIVE__MANIFEST:
>+				return basicSetManifest(null, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaPackage.ARCHIVE__ORIGINAL_FILE_PATH:
>+				return getOriginalFilePath();
>+			case JavaPackage.ARCHIVE__CLASS_FILES:
>+				return getClassFiles();
>+			case JavaPackage.ARCHIVE__MANIFEST:
>+				return getManifest();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaPackage.ARCHIVE__ORIGINAL_FILE_PATH:
>+				setOriginalFilePath((String)newValue);
>+				return;
>+			case JavaPackage.ARCHIVE__CLASS_FILES:
>+				getClassFiles().clear();
>+				getClassFiles().addAll((Collection<? extends ClassFile>)newValue);
>+				return;
>+			case JavaPackage.ARCHIVE__MANIFEST:
>+				setManifest((Manifest)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.ARCHIVE__ORIGINAL_FILE_PATH:
>+				setOriginalFilePath(ORIGINAL_FILE_PATH_EDEFAULT);
>+				return;
>+			case JavaPackage.ARCHIVE__CLASS_FILES:
>+				getClassFiles().clear();
>+				return;
>+			case JavaPackage.ARCHIVE__MANIFEST:
>+				setManifest((Manifest)null);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.ARCHIVE__ORIGINAL_FILE_PATH:
>+				return ORIGINAL_FILE_PATH_EDEFAULT == null ? originalFilePath != null : !ORIGINAL_FILE_PATH_EDEFAULT.equals(originalFilePath);
>+			case JavaPackage.ARCHIVE__CLASS_FILES:
>+				return classFiles != null && !classFiles.isEmpty();
>+			case JavaPackage.ARCHIVE__MANIFEST:
>+				return manifest != null;
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (originalFilePath: "); //$NON-NLS-1$
>+		result.append(originalFilePath);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ArchiveImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java	(revision 0)
>@@ -0,0 +1,58 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java.emf.impl;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.gmt.modisco.java.NamespaceAccess;
>+
>+import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Namespace Access'.
>+ * 
>+ * 
>+ * 
>+ *
>+ * @generated
>+ */
>+public abstract class NamespaceAccessImpl extends ASTNodeImpl implements NamespaceAccess {
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected NamespaceAccessImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaPackage.eINSTANCE.getNamespaceAccess();
>+	}
>+
>+} //NamespaceAccessImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java	(revision 0)
>@@ -0,0 +1,209 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java.emf.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.impl.MinimalEObjectImpl;
>+import org.eclipse.emf.ecore.impl.EObjectImpl;
>+
>+import org.eclipse.emf.ecore.util.EObjectContainmentEList;
>+import org.eclipse.emf.ecore.util.InternalEList;
>+
>+import org.eclipse.gmt.modisco.java.Manifest;
>+import org.eclipse.gmt.modisco.java.ManifestAttribute;
>+import org.eclipse.gmt.modisco.java.ManifestEntry;
>+
>+import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Manifest'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestImpl#getMainAttributes Main Attributes}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestImpl#getEntryAttributes Entry Attributes}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ManifestImpl extends MinimalEObjectImpl.Container implements Manifest {
>+	/**
>+	 * The cached value of the '{@link #getMainAttributes() Main Attributes}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getMainAttributes()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ManifestAttribute> mainAttributes;
>+
>+	/**
>+	 * The cached value of the '{@link #getEntryAttributes() Entry Attributes}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getEntryAttributes()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ManifestEntry> entryAttributes;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ManifestImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaPackage.eINSTANCE.getManifest();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EList<ManifestAttribute> getMainAttributes() {
>+		if (mainAttributes == null) {
>+			mainAttributes = new EObjectContainmentEList<ManifestAttribute>(ManifestAttribute.class, this, JavaPackage.MANIFEST__MAIN_ATTRIBUTES);
>+		}
>+		return mainAttributes;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EList<ManifestEntry> getEntryAttributes() {
>+		if (entryAttributes == null) {
>+			entryAttributes = new EObjectContainmentEList<ManifestEntry>(ManifestEntry.class, this, JavaPackage.MANIFEST__ENTRY_ATTRIBUTES);
>+		}
>+		return entryAttributes;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST__MAIN_ATTRIBUTES:
>+				return ((InternalEList<?>)getMainAttributes()).basicRemove(otherEnd, msgs);
>+			case JavaPackage.MANIFEST__ENTRY_ATTRIBUTES:
>+				return ((InternalEList<?>)getEntryAttributes()).basicRemove(otherEnd, msgs);
>+		}
>+		return super.eInverseRemove(otherEnd, featureID, msgs);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST__MAIN_ATTRIBUTES:
>+				return getMainAttributes();
>+			case JavaPackage.MANIFEST__ENTRY_ATTRIBUTES:
>+				return getEntryAttributes();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST__MAIN_ATTRIBUTES:
>+				getMainAttributes().clear();
>+				getMainAttributes().addAll((Collection<? extends ManifestAttribute>)newValue);
>+				return;
>+			case JavaPackage.MANIFEST__ENTRY_ATTRIBUTES:
>+				getEntryAttributes().clear();
>+				getEntryAttributes().addAll((Collection<? extends ManifestEntry>)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST__MAIN_ATTRIBUTES:
>+				getMainAttributes().clear();
>+				return;
>+			case JavaPackage.MANIFEST__ENTRY_ATTRIBUTES:
>+				getEntryAttributes().clear();
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.MANIFEST__MAIN_ATTRIBUTES:
>+				return mainAttributes != null && !mainAttributes.isEmpty();
>+			case JavaPackage.MANIFEST__ENTRY_ATTRIBUTES:
>+				return entryAttributes != null && !entryAttributes.isEmpty();
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+} //ManifestImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -171,7 +172,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (escapedValue: ");
>+		result.append(" (escapedValue: "); //$NON-NLS-1$
> 		result.append(escapedValue);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -456,7 +457,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (extraArrayDimensions: ");
>+		result.append(" (extraArrayDimensions: "); //$NON-NLS-1$
> 		result.append(extraArrayDimensions);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java	(working copy)
>@@ -38,7 +38,6 @@
> import org.eclipse.gmt.modisco.java.Type;
> import org.eclipse.gmt.modisco.java.TypeAccess;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>-import org.eclipse.gmt.modisco.java.emf.util.JavaUtil;
> 
> /**
> * 
>@@ -48,7 +47,6 @@
> * The following features are implemented:
> * <ul>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractTypeDeclarationImpl#getUsagesInTypeAccess Usages In Type Access}</li>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractTypeDeclarationImpl#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractTypeDeclarationImpl#getBodyDeclarations Body Declarations}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractTypeDeclarationImpl#getCommentsBeforeBody Comments Before Body}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractTypeDeclarationImpl#getCommentsAfterBody Comments After Body}</li>
>@@ -71,16 +69,6 @@
> 	protected EList<TypeAccess> usagesInTypeAccess;
> 
> 	/**
>-	 * The default value of the '{@link #getQualifiedName() Qualified Name}' attribute.
>-	 * 
>-	 * 
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String QUALIFIED_NAME_EDEFAULT = null;
>-
>-	/**
> 	 * The cached value of the '{@link #getBodyDeclarations() Body Declarations}' containment reference list.
> 	 * 
> 	 * 
>@@ -151,14 +139,6 @@
> 		return usagesInTypeAccess;
> 	}
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 */
>-	public String getQualifiedName() {
>-		return JavaUtil.getQualifiedName(this);
>-	}
> 
> 	/**
> 	 * 
>@@ -224,7 +204,7 @@
> 	public void setPackage(org.eclipse.gmt.modisco.java.Package newPackage) {
> 		if (newPackage != eInternalContainer() || (eContainerFeatureID() != JavaPackage.ABSTRACT_TYPE_DECLARATION__PACKAGE && newPackage != null)) {
> 			if (EcoreUtil.isAncestor(this, newPackage))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -318,8 +298,6 @@
> 		switch (featureID) {
> 			case JavaPackage.ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS:
> 				return getUsagesInTypeAccess();
>-			case JavaPackage.ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME:
>-				return getQualifiedName();
> 			case JavaPackage.ABSTRACT_TYPE_DECLARATION__BODY_DECLARATIONS:
> 				return getBodyDeclarations();
> 			case JavaPackage.ABSTRACT_TYPE_DECLARATION__COMMENTS_BEFORE_BODY:
>@@ -410,8 +388,6 @@
> 		switch (featureID) {
> 			case JavaPackage.ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS:
> 				return usagesInTypeAccess != null && !usagesInTypeAccess.isEmpty();
>-			case JavaPackage.ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME:
>-				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
> 			case JavaPackage.ABSTRACT_TYPE_DECLARATION__BODY_DECLARATIONS:
> 				return bodyDeclarations != null && !bodyDeclarations.isEmpty();
> 			case JavaPackage.ABSTRACT_TYPE_DECLARATION__COMMENTS_BEFORE_BODY:
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java	(working copy)
>@@ -28,7 +28,6 @@
> import org.eclipse.gmt.modisco.java.AbstractVariablesContainer;
> import org.eclipse.gmt.modisco.java.VariableDeclarationFragment;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>-import org.eclipse.gmt.modisco.java.emf.util.JavaUtil;
> 
> /**
> * 
>@@ -37,7 +36,6 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.VariableDeclarationFragmentImpl#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.VariableDeclarationFragmentImpl#getVariablesContainer Variables Container}</li>
> * </ul>
> * 
>@@ -46,15 +44,6 @@
> */
> public class VariableDeclarationFragmentImpl extends VariableDeclarationImpl implements VariableDeclarationFragment {
> 	/**
>-	 * The default value of the '{@link #getQualifiedName() Qualified Name}' attribute.
>-	 * 
>-	 * 
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String QUALIFIED_NAME_EDEFAULT = null;
>-	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -73,14 +62,6 @@
> 		return JavaPackage.eINSTANCE.getVariableDeclarationFragment();
> 	}
> 
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 */
>-	public String getQualifiedName() {
>-		return JavaUtil.getQualifiedName(this);
>-	}
> 
> 	/**
> 	 * 
>@@ -110,7 +91,7 @@
> 	public void setVariablesContainer(AbstractVariablesContainer newVariablesContainer) {
> 		if (newVariablesContainer != eInternalContainer() || (eContainerFeatureID() != JavaPackage.VARIABLE_DECLARATION_FRAGMENT__VARIABLES_CONTAINER && newVariablesContainer != null)) {
> 			if (EcoreUtil.isAncestor(this, newVariablesContainer))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -175,8 +156,6 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>-			case JavaPackage.VARIABLE_DECLARATION_FRAGMENT__QUALIFIED_NAME:
>-				return getQualifiedName();
> 			case JavaPackage.VARIABLE_DECLARATION_FRAGMENT__VARIABLES_CONTAINER:
> 				return getVariablesContainer();
> 		}
>@@ -221,8 +200,6 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>-			case JavaPackage.VARIABLE_DECLARATION_FRAGMENT__QUALIFIED_NAME:
>-				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
> 			case JavaPackage.VARIABLE_DECLARATION_FRAGMENT__VARIABLES_CONTAINER:
> 				return getVariablesContainer() != null;
> 		}
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -171,7 +172,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (tokenValue: ");
>+		result.append(" (tokenValue: "); //$NON-NLS-1$
> 		result.append(tokenValue);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java	(revision 0)
>@@ -0,0 +1,371 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java.emf.impl;
>+
>+import java.util.Collection;
>+
>+import org.eclipse.emf.common.notify.Notification;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EClass;
>+
>+import org.eclipse.emf.ecore.InternalEObject;
>+import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+
>+import org.eclipse.emf.ecore.util.EObjectResolvingEList;
>+
>+import org.eclipse.gmt.modisco.java.AbstractTypeDeclaration;
>+import org.eclipse.gmt.modisco.java.ClassFile;
>+
>+import org.eclipse.gmt.modisco.java.CompilationUnit;
>+import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>+
>+/**
>+ * 
>+ * An implementation of the model object 'Class File'.
>+ * 
>+ * 
>+ * The following features are implemented:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ClassFileImpl#getOriginalFilePath Original File Path}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ClassFileImpl#getType Type}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ClassFileImpl#getAttachedSource Attached Source}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ClassFileImpl#getPackage Package}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @generated
>+ */
>+public class ClassFileImpl extends NamedElementImpl implements ClassFile {
>+	/**
>+	 * The default value of the '{@link #getOriginalFilePath() Original File Path}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getOriginalFilePath()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected static final String ORIGINAL_FILE_PATH_EDEFAULT = null;
>+
>+	/**
>+	 * The cached value of the '{@link #getOriginalFilePath() Original File Path}' attribute.
>+	 * 
>+	 * 
>+	 * @see #getOriginalFilePath()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected String originalFilePath = ORIGINAL_FILE_PATH_EDEFAULT;
>+
>+	/**
>+	 * The cached value of the '{@link #getType() Type}' reference.
>+	 * 
>+	 * 
>+	 * @see #getType()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected AbstractTypeDeclaration type;
>+
>+	/**
>+	 * The cached value of the '{@link #getAttachedSource() Attached Source}' reference.
>+	 * 
>+	 * 
>+	 * @see #getAttachedSource()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected CompilationUnit attachedSource;
>+
>+	/**
>+	 * The cached value of the '{@link #getPackage() Package}' reference.
>+	 * 
>+	 * 
>+	 * @see #getPackage()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected org.eclipse.gmt.modisco.java.Package package_;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	protected ClassFileImpl() {
>+		super();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	protected EClass eStaticClass() {
>+		return JavaPackage.eINSTANCE.getClassFile();
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public String getOriginalFilePath() {
>+		return originalFilePath;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setOriginalFilePath(String newOriginalFilePath) {
>+		String oldOriginalFilePath = originalFilePath;
>+		originalFilePath = newOriginalFilePath;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.CLASS_FILE__ORIGINAL_FILE_PATH, oldOriginalFilePath, originalFilePath));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AbstractTypeDeclaration getType() {
>+		if (type != null && type.eIsProxy()) {
>+			InternalEObject oldType = (InternalEObject)type;
>+			type = (AbstractTypeDeclaration)eResolveProxy(oldType);
>+			if (type != oldType) {
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaPackage.CLASS_FILE__TYPE, oldType, type));
>+			}
>+		}
>+		return type;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public AbstractTypeDeclaration basicGetType() {
>+		return type;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setType(AbstractTypeDeclaration newType) {
>+		AbstractTypeDeclaration oldType = type;
>+		type = newType;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.CLASS_FILE__TYPE, oldType, type));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CompilationUnit getAttachedSource() {
>+		if (attachedSource != null && attachedSource.eIsProxy()) {
>+			InternalEObject oldAttachedSource = (InternalEObject)attachedSource;
>+			attachedSource = (CompilationUnit)eResolveProxy(oldAttachedSource);
>+			if (attachedSource != oldAttachedSource) {
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaPackage.CLASS_FILE__ATTACHED_SOURCE, oldAttachedSource, attachedSource));
>+			}
>+		}
>+		return attachedSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public CompilationUnit basicGetAttachedSource() {
>+		return attachedSource;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setAttachedSource(CompilationUnit newAttachedSource) {
>+		CompilationUnit oldAttachedSource = attachedSource;
>+		attachedSource = newAttachedSource;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.CLASS_FILE__ATTACHED_SOURCE, oldAttachedSource, attachedSource));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public org.eclipse.gmt.modisco.java.Package getPackage() {
>+		if (package_ != null && package_.eIsProxy()) {
>+			InternalEObject oldPackage = (InternalEObject)package_;
>+			package_ = (org.eclipse.gmt.modisco.java.Package)eResolveProxy(oldPackage);
>+			if (package_ != oldPackage) {
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaPackage.CLASS_FILE__PACKAGE, oldPackage, package_));
>+			}
>+		}
>+		return package_;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public org.eclipse.gmt.modisco.java.Package basicGetPackage() {
>+		return package_;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setPackage(org.eclipse.gmt.modisco.java.Package newPackage) {
>+		org.eclipse.gmt.modisco.java.Package oldPackage = package_;
>+		package_ = newPackage;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.CLASS_FILE__PACKAGE, oldPackage, package_));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public Object eGet(int featureID, boolean resolve, boolean coreType) {
>+		switch (featureID) {
>+			case JavaPackage.CLASS_FILE__ORIGINAL_FILE_PATH:
>+				return getOriginalFilePath();
>+			case JavaPackage.CLASS_FILE__TYPE:
>+				if (resolve) return getType();
>+				return basicGetType();
>+			case JavaPackage.CLASS_FILE__ATTACHED_SOURCE:
>+				if (resolve) return getAttachedSource();
>+				return basicGetAttachedSource();
>+			case JavaPackage.CLASS_FILE__PACKAGE:
>+				if (resolve) return getPackage();
>+				return basicGetPackage();
>+		}
>+		return super.eGet(featureID, resolve, coreType);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@SuppressWarnings("unchecked")
>+	@Override
>+	public void eSet(int featureID, Object newValue) {
>+		switch (featureID) {
>+			case JavaPackage.CLASS_FILE__ORIGINAL_FILE_PATH:
>+				setOriginalFilePath((String)newValue);
>+				return;
>+			case JavaPackage.CLASS_FILE__TYPE:
>+				setType((AbstractTypeDeclaration)newValue);
>+				return;
>+			case JavaPackage.CLASS_FILE__ATTACHED_SOURCE:
>+				setAttachedSource((CompilationUnit)newValue);
>+				return;
>+			case JavaPackage.CLASS_FILE__PACKAGE:
>+				setPackage((org.eclipse.gmt.modisco.java.Package)newValue);
>+				return;
>+		}
>+		super.eSet(featureID, newValue);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public void eUnset(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.CLASS_FILE__ORIGINAL_FILE_PATH:
>+				setOriginalFilePath(ORIGINAL_FILE_PATH_EDEFAULT);
>+				return;
>+			case JavaPackage.CLASS_FILE__TYPE:
>+				setType((AbstractTypeDeclaration)null);
>+				return;
>+			case JavaPackage.CLASS_FILE__ATTACHED_SOURCE:
>+				setAttachedSource((CompilationUnit)null);
>+				return;
>+			case JavaPackage.CLASS_FILE__PACKAGE:
>+				setPackage((org.eclipse.gmt.modisco.java.Package)null);
>+				return;
>+		}
>+		super.eUnset(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public boolean eIsSet(int featureID) {
>+		switch (featureID) {
>+			case JavaPackage.CLASS_FILE__ORIGINAL_FILE_PATH:
>+				return ORIGINAL_FILE_PATH_EDEFAULT == null ? originalFilePath != null : !ORIGINAL_FILE_PATH_EDEFAULT.equals(originalFilePath);
>+			case JavaPackage.CLASS_FILE__TYPE:
>+				return type != null;
>+			case JavaPackage.CLASS_FILE__ATTACHED_SOURCE:
>+				return attachedSource != null;
>+			case JavaPackage.CLASS_FILE__PACKAGE:
>+				return package_ != null;
>+		}
>+		return super.eIsSet(featureID);
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	@Override
>+	public String toString() {
>+		if (eIsProxy()) return super.toString();
>+
>+		StringBuffer result = new StringBuffer(super.toString());
>+		result.append(" (originalFilePath: "); //$NON-NLS-1$
>+		result.append(originalFilePath);
>+		result.append(')');
>+		return result.toString();
>+	}
>+
>+} //ClassFileImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -297,9 +298,9 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (name: ");
>+		result.append(" (name: "); //$NON-NLS-1$
> 		result.append(name);
>-		result.append(", proxy: ");
>+		result.append(", proxy: "); //$NON-NLS-1$
> 		result.append(proxy);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java	(working copy)
>@@ -39,7 +39,6 @@
> import org.eclipse.gmt.modisco.java.TypeAccess;
> import org.eclipse.gmt.modisco.java.TypeParameter;
> import org.eclipse.gmt.modisco.java.emf.JavaPackage;
>-import org.eclipse.gmt.modisco.java.emf.util.JavaUtil;
> 
> /**
> * 
>@@ -48,8 +47,6 @@
> * 
> * The following features are implemented:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractMethodDeclarationImpl#isVarargs Varargs}</li>
>- * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractMethodDeclarationImpl#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractMethodDeclarationImpl#getBody Body}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractMethodDeclarationImpl#getParameters Parameters}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractMethodDeclarationImpl#getThrownExceptions Thrown Exceptions}</li>
>@@ -63,36 +60,6 @@
> */
> public abstract class AbstractMethodDeclarationImpl extends BodyDeclarationImpl implements AbstractMethodDeclaration {
> 	/**
>-	 * The default value of the '{@link #isVarargs() Varargs}' attribute.
>-	 * 
>-	 * 
>-	 * @see #isVarargs()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final boolean VARARGS_EDEFAULT = false;
>-
>-	/**
>-	 * The cached value of the '{@link #isVarargs() Varargs}' attribute.
>-	 * 
>-	 * 
>-	 * @see #isVarargs()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected boolean varargs = VARARGS_EDEFAULT;
>-
>-	/**
>-	 * The default value of the '{@link #getQualifiedName() Qualified Name}' attribute.
>-	 * 
>-	 * 
>-	 * @see #getQualifiedName()
>-	 * @generated
>-	 * @ordered
>-	 */
>-	protected static final String QUALIFIED_NAME_EDEFAULT = null;
>-
>-	/**
> 	 * The cached value of the '{@link #getBody() Body}' containment reference.
> 	 * 
> 	 * 
>@@ -176,36 +143,6 @@
> 	 * 
> 	 * @generated
> 	 */
>-	public boolean isVarargs() {
>-		return varargs;
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	public void setVarargs(boolean newVarargs) {
>-		boolean oldVarargs = varargs;
>-		varargs = newVarargs;
>-		if (eNotificationRequired())
>-			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.ABSTRACT_METHOD_DECLARATION__VARARGS, oldVarargs, varargs));
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * 
>-	 */
>-	public String getQualifiedName() {
>-		return JavaUtil.getQualifiedName(this);
>-	}
>-
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
> 	public Block getBody() {
> 		return body;
> 	}
>@@ -355,10 +292,6 @@
> 	@Override
> 	public Object eGet(int featureID, boolean resolve, boolean coreType) {
> 		switch (featureID) {
>-			case JavaPackage.ABSTRACT_METHOD_DECLARATION__VARARGS:
>-				return isVarargs();
>-			case JavaPackage.ABSTRACT_METHOD_DECLARATION__QUALIFIED_NAME:
>-				return getQualifiedName();
> 			case JavaPackage.ABSTRACT_METHOD_DECLARATION__BODY:
> 				return getBody();
> 			case JavaPackage.ABSTRACT_METHOD_DECLARATION__PARAMETERS:
>@@ -384,9 +317,6 @@
> 	@Override
> 	public void eSet(int featureID, Object newValue) {
> 		switch (featureID) {
>-			case JavaPackage.ABSTRACT_METHOD_DECLARATION__VARARGS:
>-				setVarargs((Boolean)newValue);
>-				return;
> 			case JavaPackage.ABSTRACT_METHOD_DECLARATION__BODY:
> 				setBody((Block)newValue);
> 				return;
>@@ -422,9 +352,6 @@
> 	@Override
> 	public void eUnset(int featureID) {
> 		switch (featureID) {
>-			case JavaPackage.ABSTRACT_METHOD_DECLARATION__VARARGS:
>-				setVarargs(VARARGS_EDEFAULT);
>-				return;
> 			case JavaPackage.ABSTRACT_METHOD_DECLARATION__BODY:
> 				setBody((Block)null);
> 				return;
>@@ -455,10 +382,6 @@
> 	@Override
> 	public boolean eIsSet(int featureID) {
> 		switch (featureID) {
>-			case JavaPackage.ABSTRACT_METHOD_DECLARATION__VARARGS:
>-				return varargs != VARARGS_EDEFAULT;
>-			case JavaPackage.ABSTRACT_METHOD_DECLARATION__QUALIFIED_NAME:
>-				return QUALIFIED_NAME_EDEFAULT == null ? getQualifiedName() != null : !QUALIFIED_NAME_EDEFAULT.equals(getQualifiedName());
> 			case JavaPackage.ABSTRACT_METHOD_DECLARATION__BODY:
> 				return body != null;
> 			case JavaPackage.ABSTRACT_METHOD_DECLARATION__PARAMETERS:
>@@ -475,20 +398,4 @@
> 		return super.eIsSet(featureID);
> 	}
> 
>-	/**
>-	 * 
>-	 * 
>-	 * @generated
>-	 */
>-	@Override
>-	public String toString() {
>-		if (eIsProxy()) return super.toString();
>-
>-		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (varargs: ");
>-		result.append(varargs);
>-		result.append(')');
>-		return result.toString();
>-	}
>-
> } //AbstractMethodDeclarationImpl
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -253,7 +254,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (operator: ");
>+		result.append(" (operator: "); //$NON-NLS-1$
> 		result.append(operator);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -30,12 +31,14 @@
> import org.eclipse.emf.ecore.InternalEObject;
> 
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
> import org.eclipse.emf.ecore.impl.EObjectImpl;
> 
> import org.eclipse.emf.ecore.util.EObjectContainmentEList;
> import org.eclipse.emf.ecore.util.InternalEList;
> 
> import org.eclipse.gmt.modisco.java.ASTNode;
>+import org.eclipse.gmt.modisco.java.ClassFile;
> import org.eclipse.gmt.modisco.java.Comment;
> import org.eclipse.gmt.modisco.java.CompilationUnit;
> 
>@@ -50,12 +53,13 @@
> * <ul>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ASTNodeImpl#getComments Comments}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ASTNodeImpl#getOriginalCompilationUnit Original Compilation Unit}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ASTNodeImpl#getOriginalClassFile Original Class File}</li>
> * </ul>
> * 
> *
> * @generated
> */
>-public abstract class ASTNodeImpl extends EObjectImpl implements ASTNode {
>+public abstract class ASTNodeImpl extends MinimalEObjectImpl.Container implements ASTNode {
> 	/**
> 	 * The cached value of the '{@link #getComments() Comments}' containment reference list.
> 	 * 
>@@ -77,9 +81,19 @@
> 	protected CompilationUnit originalCompilationUnit;
> 
> 	/**
>+	 * The cached value of the '{@link #getOriginalClassFile() Original Class File}' reference.
> 	 * 
> 	 * 
>+	 * @see #getOriginalClassFile()
> 	 * @generated
>+	 * @ordered
>+	 */
>+	protected ClassFile originalClassFile;
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
> 	 */
> 	protected ASTNodeImpl() {
> 		super();
>@@ -150,6 +164,44 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public ClassFile getOriginalClassFile() {
>+		if (originalClassFile != null && originalClassFile.eIsProxy()) {
>+			InternalEObject oldOriginalClassFile = (InternalEObject)originalClassFile;
>+			originalClassFile = (ClassFile)eResolveProxy(oldOriginalClassFile);
>+			if (originalClassFile != oldOriginalClassFile) {
>+				if (eNotificationRequired())
>+					eNotify(new ENotificationImpl(this, Notification.RESOLVE, JavaPackage.AST_NODE__ORIGINAL_CLASS_FILE, oldOriginalClassFile, originalClassFile));
>+			}
>+		}
>+		return originalClassFile;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public ClassFile basicGetOriginalClassFile() {
>+		return originalClassFile;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public void setOriginalClassFile(ClassFile newOriginalClassFile) {
>+		ClassFile oldOriginalClassFile = originalClassFile;
>+		originalClassFile = newOriginalClassFile;
>+		if (eNotificationRequired())
>+			eNotify(new ENotificationImpl(this, Notification.SET, JavaPackage.AST_NODE__ORIGINAL_CLASS_FILE, oldOriginalClassFile, originalClassFile));
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	@Override
> 	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
> 		switch (featureID) {
>@@ -172,6 +224,9 @@
> 			case JavaPackage.AST_NODE__ORIGINAL_COMPILATION_UNIT:
> 				if (resolve) return getOriginalCompilationUnit();
> 				return basicGetOriginalCompilationUnit();
>+			case JavaPackage.AST_NODE__ORIGINAL_CLASS_FILE:
>+				if (resolve) return getOriginalClassFile();
>+				return basicGetOriginalClassFile();
> 		}
> 		return super.eGet(featureID, resolve, coreType);
> 	}
>@@ -192,6 +247,9 @@
> 			case JavaPackage.AST_NODE__ORIGINAL_COMPILATION_UNIT:
> 				setOriginalCompilationUnit((CompilationUnit)newValue);
> 				return;
>+			case JavaPackage.AST_NODE__ORIGINAL_CLASS_FILE:
>+				setOriginalClassFile((ClassFile)newValue);
>+				return;
> 		}
> 		super.eSet(featureID, newValue);
> 	}
>@@ -210,6 +268,9 @@
> 			case JavaPackage.AST_NODE__ORIGINAL_COMPILATION_UNIT:
> 				setOriginalCompilationUnit((CompilationUnit)null);
> 				return;
>+			case JavaPackage.AST_NODE__ORIGINAL_CLASS_FILE:
>+				setOriginalClassFile((ClassFile)null);
>+				return;
> 		}
> 		super.eUnset(featureID);
> 	}
>@@ -226,6 +287,8 @@
> 				return comments != null && !comments.isEmpty();
> 			case JavaPackage.AST_NODE__ORIGINAL_COMPILATION_UNIT:
> 				return originalCompilationUnit != null;
>+			case JavaPackage.AST_NODE__ORIGINAL_CLASS_FILE:
>+				return originalClassFile != null;
> 		}
> 		return super.eIsSet(featureID);
> 	}
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -252,7 +253,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (default: ");
>+		result.append(" (default: "); //$NON-NLS-1$
> 		result.append(default_);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -361,7 +362,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (originalFilePath: ");
>+		result.append(" (originalFilePath: "); //$NON-NLS-1$
> 		result.append(originalFilePath);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -45,7 +46,7 @@
> *
> * @generated
> */
>-public class PackageAccessImpl extends ExpressionImpl implements PackageAccess {
>+public class PackageAccessImpl extends NamespaceAccessImpl implements PackageAccess {
> 	/**
> 	 * The cached value of the '{@link #getPackage() Package}' reference.
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/java.ecore
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/java.ecore	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/java.ecore	(working copy)
>@@ -1,15 +1,20 @@
> <?xml version="1.0" encoding="UTF-8"?>
>+
> <ecore:EPackage xmi:version="2.0"
> xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
> xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="java"
>- nsURI="http://www.eclipse.org/MoDisco/Java" nsPrefix="java">
>+ nsURI="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" nsPrefix="java">
> <eClassifiers xsi:type="ecore:EClass" name="AbstractMethodDeclaration" abstract="true"
> eSuperTypes="#//BodyDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="varargs" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" eType="#//Block"
> containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
>@@ -34,9 +39,6 @@
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="AbstractTypeDeclaration" abstract="true"
> eSuperTypes="#//BodyDeclaration #//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclarations" upperBound="-1"
> eType="#//BodyDeclaration" containment="true" eOpposite="#//BodyDeclaration/abstractTypeDeclaration"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="commentsBeforeBody" upperBound="-1"
>@@ -66,6 +68,14 @@
> <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
> eType="#//AnnotationMemberValuePair" containment="true"/>
> </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Archive" eSuperTypes="#//NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalFilePath" ordered="false"
>+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="classFiles" ordered="false"
>+ upperBound="-1" eType="#//ClassFile" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="manifest" ordered="false"
>+ eType="#//Manifest" containment="true"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="AssertStatement" eSuperTypes="#//Statement">
> <eStructuralFeatures xsi:type="ecore:EReference" name="message" ordered="false"
> eType="#//Expression" containment="true"/>
>@@ -77,6 +87,8 @@
> eType="#//Comment" containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="originalCompilationUnit"
> ordered="false" eType="#//CompilationUnit"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="originalClassFile" ordered="false"
>+ eType="#//ClassFile"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="AnnotationMemberValuePair" eSuperTypes="#//NamedElement">
> <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"
>@@ -122,9 +134,6 @@
> lowerBound="1" eType="#//Expression" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ArrayType" eSuperTypes="#//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="dimensions" ordered="false"
> unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" ordered="false"
>@@ -139,8 +148,8 @@
> lowerBound="1" eType="#//Expression" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="AssignmentKind">
>- <eLiterals name="ASSIGN" value="1" literal="+="/>
>- <eLiterals name="PLUS_ASSIGN" value="2"/>
>+ <eLiterals name="ASSIGN" value="1" literal="="/>
>+ <eLiterals name="PLUS_ASSIGN" value="2" literal="+="/>
> <eLiterals name="MINUS_ASSIGN" value="3" literal="-="/>
> <eLiterals name="TIMES_ASSIGN" value="4" literal="*="/>
> <eLiterals name="DIVIDE_ASSIGN" value="5" literal="/="/>
>@@ -191,6 +200,15 @@
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" ordered="false"
> unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ClassFile" eSuperTypes="#//NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalFilePath" ordered="false"
>+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" eType="#//AbstractTypeDeclaration"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="attachedSource" ordered="false"
>+ eType="#//CompilationUnit"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false"
>+ eType="#//Package"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ClassInstanceCreation" eSuperTypes="#//Expression #//AbstractMethodInvocation">
> <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclaration"
> ordered="false" eType="#//AnonymousClassDeclaration" containment="true" eOpposite="#//AnonymousClassDeclaration/classInstanceCreation"/>
>@@ -358,6 +376,24 @@
> ordered="false" upperBound="-1" eType="#//ContinueStatement" eOpposite="#//ContinueStatement/label"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="LineComment" eSuperTypes="#//Comment"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="Manifest">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="mainAttributes" ordered="false"
>+ upperBound="-1" eType="#//ManifestAttribute" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="entryAttributes" ordered="false"
>+ upperBound="-1" eType="#//ManifestEntry" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ManifestAttribute">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" ordered="false" unique="false"
>+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
>+ unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ManifestEntry">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
>+ lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" ordered="false"
>+ upperBound="-1" eType="#//ManifestAttribute" containment="true"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="MemberRef" eSuperTypes="#//ASTNode">
> <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"
> lowerBound="1" eType="#//NamedElement"/>
>@@ -405,6 +441,10 @@
> upperBound="-1" eType="#//UnresolvedItem" containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="compilationUnits" ordered="false"
> upperBound="-1" eType="#//CompilationUnit" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="classFiles" ordered="false"
>+ upperBound="-1" eType="#//ClassFile" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="archives" ordered="false"
>+ upperBound="-1" eType="#//Archive" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="Modifier" eSuperTypes="#//ASTNode">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" ordered="false"
>@@ -440,15 +480,13 @@
> <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInImports" ordered="false"
> upperBound="-1" eType="#//ImportDeclaration" eOpposite="#//ImportDeclaration/importedElement"/>
> </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="NamespaceAccess" abstract="true" eSuperTypes="#//ASTNode"/>
> <eClassifiers xsi:type="ecore:EClass" name="NumberLiteral" eSuperTypes="#//Expression">
> <eStructuralFeatures xsi:type="ecore:EAttribute" name="tokenValue" ordered="false"
> unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="NullLiteral" eSuperTypes="#//Expression"/>
> <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" ordered="false"
> upperBound="-1" eType="#//AbstractTypeDeclaration" containment="true" eOpposite="#//AbstractTypeDeclaration/package"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="model" ordered="false"
>@@ -460,16 +498,13 @@
> <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInPackageAccess"
> ordered="false" upperBound="-1" eType="#//PackageAccess" eOpposite="#//PackageAccess/package"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="PackageAccess" eSuperTypes="#//Expression">
>+ <eClassifiers xsi:type="ecore:EClass" name="PackageAccess" eSuperTypes="#//NamespaceAccess">
> <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false"
> lowerBound="1" eType="#//Package" eOpposite="#//Package/usagesInPackageAccess"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
> eType="#//PackageAccess" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="ParameterizedType" eSuperTypes="#//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
> eType="#//TypeAccess" containment="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="typeArguments" upperBound="-1"
>@@ -598,11 +633,11 @@
> <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInTypeAccess" ordered="false"
> upperBound="-1" eType="#//TypeAccess" eOpposite="#//TypeAccess/type"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeAccess" eSuperTypes="#//Expression">
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeAccess" eSuperTypes="#//Expression #//NamespaceAccess">
> <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
> eType="#//Type" eOpposite="#//Type/usagesInTypeAccess"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//Expression" containment="true"/>
>+ eType="#//NamespaceAccess" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="TypeDeclaration" abstract="true" eSuperTypes="#//AbstractTypeDeclaration">
> <eStructuralFeatures xsi:type="ecore:EReference" name="typeParameters" upperBound="-1"
>@@ -621,11 +656,11 @@
> eType="#//TypeAccess" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItem" eSuperTypes="#//NamedElement"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItemAccess" eSuperTypes="#//Expression">
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItemAccess" eSuperTypes="#//Expression #//NamespaceAccess">
> <eStructuralFeatures xsi:type="ecore:EReference" name="element" ordered="false"
> eType="#//UnresolvedItem"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//Expression" containment="true"/>
>+ eType="#//ASTNode" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="UnresolvedAnnotationDeclaration" eSuperTypes="#//AnnotationTypeDeclaration #//UnresolvedItem"/>
> <eClassifiers xsi:type="ecore:EClass" name="UnresolvedAnnotationTypeMemberDeclaration"
>@@ -657,9 +692,6 @@
> eType="#//Annotation" containment="true"/>
> </eClassifiers>
> <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationFragment" eSuperTypes="#//VariableDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
> <eStructuralFeatures xsi:type="ecore:EReference" name="variablesContainer" ordered="false"
> eType="#//AbstractVariablesContainer" eOpposite="#//AbstractVariablesContainer/fragments"/>
> </eClassifiers>
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -439,7 +440,7 @@
> 	public void setBodyDeclaration(BodyDeclaration newBodyDeclaration) {
> 		if (newBodyDeclaration != eInternalContainer() || (eContainerFeatureID() != JavaPackage.MODIFIER__BODY_DECLARATION && newBodyDeclaration != null)) {
> 			if (EcoreUtil.isAncestor(this, newBodyDeclaration))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -480,7 +481,7 @@
> 	public void setSingleVariableDeclaration(SingleVariableDeclaration newSingleVariableDeclaration) {
> 		if (newSingleVariableDeclaration != eInternalContainer() || (eContainerFeatureID() != JavaPackage.MODIFIER__SINGLE_VARIABLE_DECLARATION && newSingleVariableDeclaration != null)) {
> 			if (EcoreUtil.isAncestor(this, newSingleVariableDeclaration))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -521,7 +522,7 @@
> 	public void setVariableDeclarationStatement(VariableDeclarationStatement newVariableDeclarationStatement) {
> 		if (newVariableDeclarationStatement != eInternalContainer() || (eContainerFeatureID() != JavaPackage.MODIFIER__VARIABLE_DECLARATION_STATEMENT && newVariableDeclarationStatement != null)) {
> 			if (EcoreUtil.isAncestor(this, newVariableDeclarationStatement))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -562,7 +563,7 @@
> 	public void setVariableDeclarationExpression(VariableDeclarationExpression newVariableDeclarationExpression) {
> 		if (newVariableDeclarationExpression != eInternalContainer() || (eContainerFeatureID() != JavaPackage.MODIFIER__VARIABLE_DECLARATION_EXPRESSION && newVariableDeclarationExpression != null)) {
> 			if (EcoreUtil.isAncestor(this, newVariableDeclarationExpression))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -821,21 +822,21 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (visibility: ");
>+		result.append(" (visibility: "); //$NON-NLS-1$
> 		result.append(visibility);
>-		result.append(", inheritance: ");
>+		result.append(", inheritance: "); //$NON-NLS-1$
> 		result.append(inheritance);
>-		result.append(", static: ");
>+		result.append(", static: "); //$NON-NLS-1$
> 		result.append(static_);
>-		result.append(", transient: ");
>+		result.append(", transient: "); //$NON-NLS-1$
> 		result.append(transient_);
>-		result.append(", volatile: ");
>+		result.append(", volatile: "); //$NON-NLS-1$
> 		result.append(volatile_);
>-		result.append(", native: ");
>+		result.append(", native: "); //$NON-NLS-1$
> 		result.append(native_);
>-		result.append(", strictfp: ");
>+		result.append(", strictfp: "); //$NON-NLS-1$
> 		result.append(strictfp_);
>-		result.append(", synchronized: ");
>+		result.append(", synchronized: "); //$NON-NLS-1$
> 		result.append(synchronized_);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -286,7 +287,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (static: ");
>+		result.append(" (static: "); //$NON-NLS-1$
> 		result.append(static_);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -453,7 +454,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (extraArrayDimensions: ");
>+		result.append(" (extraArrayDimensions: "); //$NON-NLS-1$
> 		result.append(extraArrayDimensions);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -30,12 +31,15 @@
> import org.eclipse.emf.ecore.InternalEObject;
> 
> import org.eclipse.emf.ecore.impl.ENotificationImpl;
>+import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
> import org.eclipse.emf.ecore.impl.EObjectImpl;
> 
> import org.eclipse.emf.ecore.util.EObjectContainmentEList;
> import org.eclipse.emf.ecore.util.EObjectContainmentWithInverseEList;
> import org.eclipse.emf.ecore.util.InternalEList;
> 
>+import org.eclipse.gmt.modisco.java.Archive;
>+import org.eclipse.gmt.modisco.java.ClassFile;
> import org.eclipse.gmt.modisco.java.CompilationUnit;
> import org.eclipse.gmt.modisco.java.Model;
> import org.eclipse.gmt.modisco.java.Type;
>@@ -55,12 +59,14 @@
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ModelImpl#getOrphanTypes Orphan Types}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ModelImpl#getUnresolvedItems Unresolved Items}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ModelImpl#getCompilationUnits Compilation Units}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ModelImpl#getClassFiles Class Files}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.emf.impl.ModelImpl#getArchives Archives}</li>
> * </ul>
> * 
> *
> * @generated
> */
>-public class ModelImpl extends EObjectImpl implements Model {
>+public class ModelImpl extends MinimalEObjectImpl.Container implements Model {
> 	/**
> 	 * The default value of the '{@link #getName() Name}' attribute.
> 	 * 
>@@ -122,6 +128,26 @@
> 	protected EList<CompilationUnit> compilationUnits;
> 
> 	/**
>+	 * The cached value of the '{@link #getClassFiles() Class Files}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getClassFiles()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<ClassFile> classFiles;
>+
>+	/**
>+	 * The cached value of the '{@link #getArchives() Archives}' containment reference list.
>+	 * 
>+	 * 
>+	 * @see #getArchives()
>+	 * @generated
>+	 * @ordered
>+	 */
>+	protected EList<Archive> archives;
>+
>+	/**
> 	 * 
> 	 * 
> 	 * @generated
>@@ -214,6 +240,30 @@
> 	 * 
> 	 * @generated
> 	 */
>+	public EList<ClassFile> getClassFiles() {
>+		if (classFiles == null) {
>+			classFiles = new EObjectContainmentEList<ClassFile>(ClassFile.class, this, JavaPackage.MODEL__CLASS_FILES);
>+		}
>+		return classFiles;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
>+	public EList<Archive> getArchives() {
>+		if (archives == null) {
>+			archives = new EObjectContainmentEList<Archive>(Archive.class, this, JavaPackage.MODEL__ARCHIVES);
>+		}
>+		return archives;
>+	}
>+
>+	/**
>+	 * 
>+	 * 
>+	 * @generated
>+	 */
> 	@SuppressWarnings("unchecked")
> 	@Override
> 	public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
>@@ -240,6 +290,10 @@
> 				return ((InternalEList<?>)getUnresolvedItems()).basicRemove(otherEnd, msgs);
> 			case JavaPackage.MODEL__COMPILATION_UNITS:
> 				return ((InternalEList<?>)getCompilationUnits()).basicRemove(otherEnd, msgs);
>+			case JavaPackage.MODEL__CLASS_FILES:
>+				return ((InternalEList<?>)getClassFiles()).basicRemove(otherEnd, msgs);
>+			case JavaPackage.MODEL__ARCHIVES:
>+				return ((InternalEList<?>)getArchives()).basicRemove(otherEnd, msgs);
> 		}
> 		return super.eInverseRemove(otherEnd, featureID, msgs);
> 	}
>@@ -262,6 +316,10 @@
> 				return getUnresolvedItems();
> 			case JavaPackage.MODEL__COMPILATION_UNITS:
> 				return getCompilationUnits();
>+			case JavaPackage.MODEL__CLASS_FILES:
>+				return getClassFiles();
>+			case JavaPackage.MODEL__ARCHIVES:
>+				return getArchives();
> 		}
> 		return super.eGet(featureID, resolve, coreType);
> 	}
>@@ -294,6 +352,14 @@
> 				getCompilationUnits().clear();
> 				getCompilationUnits().addAll((Collection<? extends CompilationUnit>)newValue);
> 				return;
>+			case JavaPackage.MODEL__CLASS_FILES:
>+				getClassFiles().clear();
>+				getClassFiles().addAll((Collection<? extends ClassFile>)newValue);
>+				return;
>+			case JavaPackage.MODEL__ARCHIVES:
>+				getArchives().clear();
>+				getArchives().addAll((Collection<? extends Archive>)newValue);
>+				return;
> 		}
> 		super.eSet(featureID, newValue);
> 	}
>@@ -321,6 +387,12 @@
> 			case JavaPackage.MODEL__COMPILATION_UNITS:
> 				getCompilationUnits().clear();
> 				return;
>+			case JavaPackage.MODEL__CLASS_FILES:
>+				getClassFiles().clear();
>+				return;
>+			case JavaPackage.MODEL__ARCHIVES:
>+				getArchives().clear();
>+				return;
> 		}
> 		super.eUnset(featureID);
> 	}
>@@ -343,6 +415,10 @@
> 				return unresolvedItems != null && !unresolvedItems.isEmpty();
> 			case JavaPackage.MODEL__COMPILATION_UNITS:
> 				return compilationUnits != null && !compilationUnits.isEmpty();
>+			case JavaPackage.MODEL__CLASS_FILES:
>+				return classFiles != null && !classFiles.isEmpty();
>+			case JavaPackage.MODEL__ARCHIVES:
>+				return archives != null && !archives.isEmpty();
> 		}
> 		return super.eIsSet(featureID);
> 	}
>@@ -357,7 +433,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (name: ");
>+		result.append(" (name: "); //$NON-NLS-1$
> 		result.append(name);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -127,7 +128,7 @@
> 	public void setAbstractTypeDeclaration(AbstractTypeDeclaration newAbstractTypeDeclaration) {
> 		if (newAbstractTypeDeclaration != eInternalContainer() || (eContainerFeatureID() != JavaPackage.BODY_DECLARATION__ABSTRACT_TYPE_DECLARATION && newAbstractTypeDeclaration != null)) {
> 			if (EcoreUtil.isAncestor(this, newAbstractTypeDeclaration))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -180,7 +181,7 @@
> 	public void setAnonymousClassDeclarationOwner(AnonymousClassDeclaration newAnonymousClassDeclarationOwner) {
> 		if (newAnonymousClassDeclarationOwner != eInternalContainer() || (eContainerFeatureID() != JavaPackage.BODY_DECLARATION__ANONYMOUS_CLASS_DECLARATION_OWNER && newAnonymousClassDeclarationOwner != null)) {
> 			if (EcoreUtil.isAncestor(this, newAnonymousClassDeclarationOwner))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -252,7 +253,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (upperBound: ");
>+		result.append(" (upperBound: "); //$NON-NLS-1$
> 		result.append(upperBound);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -253,7 +254,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (operator: ");
>+		result.append(" (operator: "); //$NON-NLS-1$
> 		result.append(operator);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -171,7 +172,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (value: ");
>+		result.append(" (value: "); //$NON-NLS-1$
> 		result.append(value);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -312,7 +313,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (extraArrayDimensions: ");
>+		result.append(" (extraArrayDimensions: "); //$NON-NLS-1$
> 		result.append(extraArrayDimensions);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -171,7 +172,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (text: ");
>+		result.append(" (text: "); //$NON-NLS-1$
> 		result.append(text);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -281,7 +282,7 @@
> 	public void setMethodDeclaration(AbstractMethodDeclaration newMethodDeclaration) {
> 		if (newMethodDeclaration != eInternalContainer() || (eContainerFeatureID() != JavaPackage.SINGLE_VARIABLE_DECLARATION__METHOD_DECLARATION && newMethodDeclaration != null)) {
> 			if (EcoreUtil.isAncestor(this, newMethodDeclaration))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -322,7 +323,7 @@
> 	public void setCatchClause(CatchClause newCatchClause) {
> 		if (newCatchClause != eInternalContainer() || (eContainerFeatureID() != JavaPackage.SINGLE_VARIABLE_DECLARATION__CATCH_CLAUSE && newCatchClause != null)) {
> 			if (EcoreUtil.isAncestor(this, newCatchClause))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -363,7 +364,7 @@
> 	public void setEnhancedForStatement(EnhancedForStatement newEnhancedForStatement) {
> 		if (newEnhancedForStatement != eInternalContainer() || (eContainerFeatureID() != JavaPackage.SINGLE_VARIABLE_DECLARATION__ENHANCED_FOR_STATEMENT && newEnhancedForStatement != null)) {
> 			if (EcoreUtil.isAncestor(this, newEnhancedForStatement))
>-				throw new IllegalArgumentException("Recursive containment not allowed for " + toString());
>+				throw new IllegalArgumentException("Recursive containment not allowed for " + toString()); //$NON-NLS-1$
> 			NotificationChain msgs = null;
> 			if (eInternalContainer() != null)
> 				msgs = eBasicRemoveFromContainer(msgs);
>@@ -576,7 +577,7 @@
> 		if (eIsProxy()) return super.toString();
> 
> 		StringBuffer result = new StringBuffer(super.toString());
>-		result.append(" (varargs: ");
>+		result.append(" (varargs: "); //$NON-NLS-1$
> 		result.append(varargs);
> 		result.append(')');
> 		return result.toString();
>Index: src/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/emf/JavaPackage.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/JavaPackage.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/JavaPackage.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -47,7 +48,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	String eNAME = "java";
>+	String eNAME = "java"; //$NON-NLS-1$
> 
> 	/**
> 	 * The package namespace URI.
>@@ -55,7 +56,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	String eNS_URI = "http://www.eclipse.org/MoDisco/Java";
>+	String eNS_URI = "http://www.eclipse.org/MoDisco/Java/0.2.incubation/java"; //$NON-NLS-1$
> 
> 	/**
> 	 * The package namespace name.
>@@ -63,7 +64,7 @@
> 	 * 
> 	 * @generated
> 	 */
>-	String eNS_PREFIX = "java";
>+	String eNS_PREFIX = "java"; //$NON-NLS-1$
> 
> 	/**
> 	 * The singleton instance of the package.
>@@ -81,7 +82,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getASTNode()
> 	 * @generated
> 	 */
>-	int AST_NODE = 7;
>+	int AST_NODE = 8;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -102,13 +103,22 @@
> 	int AST_NODE__ORIGINAL_COMPILATION_UNIT = 1;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int AST_NODE__ORIGINAL_CLASS_FILE = 2;
>+
>+	/**
> 	 * The number of structural features of the 'AST Node' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int AST_NODE_FEATURE_COUNT = 2;
>+	int AST_NODE_FEATURE_COUNT = 3;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.NamedElementImpl Named Element}' class.
>@@ -118,7 +128,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getNamedElement()
> 	 * @generated
> 	 */
>-	int NAMED_ELEMENT = 60;
>+	int NAMED_ELEMENT = 65;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -139,6 +149,15 @@
> 	int NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NAMED_ELEMENT__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -182,7 +201,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getBodyDeclaration()
> 	 * @generated
> 	 */
>-	int BODY_DECLARATION = 18;
>+	int BODY_DECLARATION = 19;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -203,6 +222,15 @@
> 	int BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int BODY_DECLARATION__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -303,6 +331,15 @@
> 	int ABSTRACT_METHOD_DECLARATION__ORIGINAL_COMPILATION_UNIT = BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ABSTRACT_METHOD_DECLARATION__ORIGINAL_CLASS_FILE = BODY_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -366,31 +403,13 @@
> 	int ABSTRACT_METHOD_DECLARATION__MODIFIER = BODY_DECLARATION__MODIFIER;
> 
> 	/**
>-	 * The feature id for the 'Varargs' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int ABSTRACT_METHOD_DECLARATION__VARARGS = BODY_DECLARATION_FEATURE_COUNT + 0;
>-
>-	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int ABSTRACT_METHOD_DECLARATION__QUALIFIED_NAME = BODY_DECLARATION_FEATURE_COUNT + 1;
>-
>-	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION__BODY = BODY_DECLARATION_FEATURE_COUNT + 2;
>+	int ABSTRACT_METHOD_DECLARATION__BODY = BODY_DECLARATION_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The feature id for the 'Parameters' containment reference list.
>@@ -399,7 +418,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION__PARAMETERS = BODY_DECLARATION_FEATURE_COUNT + 3;
>+	int ABSTRACT_METHOD_DECLARATION__PARAMETERS = BODY_DECLARATION_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The feature id for the 'Thrown Exceptions' containment reference list.
>@@ -408,7 +427,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION__THROWN_EXCEPTIONS = BODY_DECLARATION_FEATURE_COUNT + 4;
>+	int ABSTRACT_METHOD_DECLARATION__THROWN_EXCEPTIONS = BODY_DECLARATION_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'Type Parameters' containment reference list.
>@@ -417,7 +436,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION__TYPE_PARAMETERS = BODY_DECLARATION_FEATURE_COUNT + 5;
>+	int ABSTRACT_METHOD_DECLARATION__TYPE_PARAMETERS = BODY_DECLARATION_FEATURE_COUNT + 3;
> 
> 	/**
> 	 * The feature id for the 'Usages In Doc Comments' reference list.
>@@ -426,7 +445,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION__USAGES_IN_DOC_COMMENTS = BODY_DECLARATION_FEATURE_COUNT + 6;
>+	int ABSTRACT_METHOD_DECLARATION__USAGES_IN_DOC_COMMENTS = BODY_DECLARATION_FEATURE_COUNT + 4;
> 
> 	/**
> 	 * The feature id for the 'Usages' reference list.
>@@ -435,7 +454,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION__USAGES = BODY_DECLARATION_FEATURE_COUNT + 7;
>+	int ABSTRACT_METHOD_DECLARATION__USAGES = BODY_DECLARATION_FEATURE_COUNT + 5;
> 
> 	/**
> 	 * The number of structural features of the 'Abstract Method Declaration' class.
>@@ -444,7 +463,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_METHOD_DECLARATION_FEATURE_COUNT = BODY_DECLARATION_FEATURE_COUNT + 8;
>+	int ABSTRACT_METHOD_DECLARATION_FEATURE_COUNT = BODY_DECLARATION_FEATURE_COUNT + 6;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.AbstractMethodInvocationImpl Abstract Method Invocation}' class.
>@@ -475,6 +494,15 @@
> 	int ABSTRACT_METHOD_INVOCATION__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ABSTRACT_METHOD_INVOCATION__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Method' reference.
> 	 * 
> 	 * 
>@@ -539,6 +567,15 @@
> 	int ABSTRACT_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT = BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ABSTRACT_TYPE_DECLARATION__ORIGINAL_CLASS_FILE = BODY_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -611,22 +648,13 @@
> 	int ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS = BODY_DECLARATION_FEATURE_COUNT + 0;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME = BODY_DECLARATION_FEATURE_COUNT + 1;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_TYPE_DECLARATION__BODY_DECLARATIONS = BODY_DECLARATION_FEATURE_COUNT + 2;
>+	int ABSTRACT_TYPE_DECLARATION__BODY_DECLARATIONS = BODY_DECLARATION_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The feature id for the 'Comments Before Body' containment reference list.
>@@ -635,7 +663,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_TYPE_DECLARATION__COMMENTS_BEFORE_BODY = BODY_DECLARATION_FEATURE_COUNT + 3;
>+	int ABSTRACT_TYPE_DECLARATION__COMMENTS_BEFORE_BODY = BODY_DECLARATION_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'Comments After Body' containment reference list.
>@@ -644,7 +672,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_TYPE_DECLARATION__COMMENTS_AFTER_BODY = BODY_DECLARATION_FEATURE_COUNT + 4;
>+	int ABSTRACT_TYPE_DECLARATION__COMMENTS_AFTER_BODY = BODY_DECLARATION_FEATURE_COUNT + 3;
> 
> 	/**
> 	 * The feature id for the 'Package' container reference.
>@@ -653,7 +681,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_TYPE_DECLARATION__PACKAGE = BODY_DECLARATION_FEATURE_COUNT + 5;
>+	int ABSTRACT_TYPE_DECLARATION__PACKAGE = BODY_DECLARATION_FEATURE_COUNT + 4;
> 
> 	/**
> 	 * The feature id for the 'Super Interfaces' containment reference list.
>@@ -662,7 +690,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_TYPE_DECLARATION__SUPER_INTERFACES = BODY_DECLARATION_FEATURE_COUNT + 6;
>+	int ABSTRACT_TYPE_DECLARATION__SUPER_INTERFACES = BODY_DECLARATION_FEATURE_COUNT + 5;
> 
> 	/**
> 	 * The number of structural features of the 'Abstract Type Declaration' class.
>@@ -671,7 +699,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ABSTRACT_TYPE_DECLARATION_FEATURE_COUNT = BODY_DECLARATION_FEATURE_COUNT + 7;
>+	int ABSTRACT_TYPE_DECLARATION_FEATURE_COUNT = BODY_DECLARATION_FEATURE_COUNT + 6;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ExpressionImpl Expression}' class.
>@@ -681,7 +709,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getExpression()
> 	 * @generated
> 	 */
>-	int EXPRESSION = 39;
>+	int EXPRESSION = 41;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -702,6 +730,15 @@
> 	int EXPRESSION__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int EXPRESSION__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The number of structural features of the 'Expression' class.
> 	 * 
> 	 * 
>@@ -739,6 +776,15 @@
> 	int ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Qualifier' containment reference.
> 	 * 
> 	 * 
>@@ -785,6 +831,15 @@
> 	int ABSTRACT_VARIABLES_CONTAINER__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ABSTRACT_VARIABLES_CONTAINER__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Type' containment reference.
> 	 * 
> 	 * 
>@@ -840,6 +895,15 @@
> 	int ANNOTATION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ANNOTATION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Type' containment reference.
> 	 * 
> 	 * 
>@@ -867,6 +931,106 @@
> 	int ANNOTATION_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ArchiveImpl Archive}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.ArchiveImpl
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getArchive()
>+	 * @generated
>+	 */
>+	int ARCHIVE = 6;
>+
>+	/**
>+	 * The feature id for the 'Comments' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__COMMENTS = NAMED_ELEMENT__COMMENTS;
>+
>+	/**
>+	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
>+	 * The feature id for the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__NAME = NAMED_ELEMENT__NAME;
>+
>+	/**
>+	 * The feature id for the 'Proxy' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__PROXY = NAMED_ELEMENT__PROXY;
>+
>+	/**
>+	 * The feature id for the 'Usages In Imports' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__USAGES_IN_IMPORTS = NAMED_ELEMENT__USAGES_IN_IMPORTS;
>+
>+	/**
>+	 * The feature id for the 'Original File Path' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__ORIGINAL_FILE_PATH = NAMED_ELEMENT_FEATURE_COUNT + 0;
>+
>+	/**
>+	 * The feature id for the 'Class Files' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__CLASS_FILES = NAMED_ELEMENT_FEATURE_COUNT + 1;
>+
>+	/**
>+	 * The feature id for the 'Manifest' containment reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE__MANIFEST = NAMED_ELEMENT_FEATURE_COUNT + 2;
>+
>+	/**
>+	 * The number of structural features of the 'Archive' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARCHIVE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 3;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.StatementImpl Statement}' class.
> 	 * 
> 	 * 
>@@ -874,7 +1038,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getStatement()
> 	 * @generated
> 	 */
>-	int STATEMENT = 82;
>+	int STATEMENT = 88;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -895,6 +1059,15 @@
> 	int STATEMENT__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int STATEMENT__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The number of structural features of the 'Statement' class.
> 	 * 
> 	 * 
>@@ -911,7 +1084,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAssertStatement()
> 	 * @generated
> 	 */
>-	int ASSERT_STATEMENT = 6;
>+	int ASSERT_STATEMENT = 7;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -932,6 +1105,15 @@
> 	int ASSERT_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASSERT_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Message' containment reference.
> 	 * 
> 	 * 
>@@ -966,7 +1148,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAnnotationMemberValuePair()
> 	 * @generated
> 	 */
>-	int ANNOTATION_MEMBER_VALUE_PAIR = 8;
>+	int ANNOTATION_MEMBER_VALUE_PAIR = 9;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -987,6 +1169,15 @@
> 	int ANNOTATION_MEMBER_VALUE_PAIR__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ANNOTATION_MEMBER_VALUE_PAIR__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -1048,7 +1239,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAnnotationTypeDeclaration()
> 	 * @generated
> 	 */
>-	int ANNOTATION_TYPE_DECLARATION = 9;
>+	int ANNOTATION_TYPE_DECLARATION = 10;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1069,6 +1260,15 @@
> 	int ANNOTATION_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ANNOTATION_TYPE_DECLARATION__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -1141,15 +1341,6 @@
> 	int ANNOTATION_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS = ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int ANNOTATION_TYPE_DECLARATION__QUALIFIED_NAME = ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -1211,7 +1402,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAnnotationTypeMemberDeclaration()
> 	 * @generated
> 	 */
>-	int ANNOTATION_TYPE_MEMBER_DECLARATION = 10;
>+	int ANNOTATION_TYPE_MEMBER_DECLARATION = 11;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1232,6 +1423,15 @@
> 	int ANNOTATION_TYPE_MEMBER_DECLARATION__ORIGINAL_COMPILATION_UNIT = BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ANNOTATION_TYPE_MEMBER_DECLARATION__ORIGINAL_CLASS_FILE = BODY_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -1338,7 +1538,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAnonymousClassDeclaration()
> 	 * @generated
> 	 */
>-	int ANONYMOUS_CLASS_DECLARATION = 11;
>+	int ANONYMOUS_CLASS_DECLARATION = 12;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1359,6 +1559,15 @@
> 	int ANONYMOUS_CLASS_DECLARATION__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ANONYMOUS_CLASS_DECLARATION__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -1393,7 +1602,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getArrayAccess()
> 	 * @generated
> 	 */
>-	int ARRAY_ACCESS = 12;
>+	int ARRAY_ACCESS = 13;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1414,6 +1623,15 @@
> 	int ARRAY_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARRAY_ACCESS__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Array' containment reference.
> 	 * 
> 	 * 
>@@ -1448,7 +1666,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getArrayCreation()
> 	 * @generated
> 	 */
>-	int ARRAY_CREATION = 13;
>+	int ARRAY_CREATION = 14;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1469,6 +1687,15 @@
> 	int ARRAY_CREATION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARRAY_CREATION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Dimensions' containment reference list.
> 	 * 
> 	 * 
>@@ -1512,7 +1739,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getArrayInitializer()
> 	 * @generated
> 	 */
>-	int ARRAY_INITIALIZER = 14;
>+	int ARRAY_INITIALIZER = 15;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1533,6 +1760,15 @@
> 	int ARRAY_INITIALIZER__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARRAY_INITIALIZER__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expressions' containment reference list.
> 	 * 
> 	 * 
>@@ -1558,7 +1794,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getArrayLengthAccess()
> 	 * @generated
> 	 */
>-	int ARRAY_LENGTH_ACCESS = 15;
>+	int ARRAY_LENGTH_ACCESS = 16;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1579,6 +1815,15 @@
> 	int ARRAY_LENGTH_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARRAY_LENGTH_ACCESS__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Array' containment reference.
> 	 * 
> 	 * 
>@@ -1604,7 +1849,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getType()
> 	 * @generated
> 	 */
>-	int TYPE = 95;
>+	int TYPE = 101;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1625,6 +1870,15 @@
> 	int TYPE__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TYPE__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -1677,7 +1931,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getArrayType()
> 	 * @generated
> 	 */
>-	int ARRAY_TYPE = 16;
>+	int ARRAY_TYPE = 17;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1698,6 +1952,15 @@
> 	int ARRAY_TYPE__ORIGINAL_COMPILATION_UNIT = TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ARRAY_TYPE__ORIGINAL_CLASS_FILE = TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -1734,22 +1997,13 @@
> 	int ARRAY_TYPE__USAGES_IN_TYPE_ACCESS = TYPE__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int ARRAY_TYPE__QUALIFIED_NAME = TYPE_FEATURE_COUNT + 0;
>-
>-	/**
> 	 * The feature id for the 'Dimensions' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ARRAY_TYPE__DIMENSIONS = TYPE_FEATURE_COUNT + 1;
>+	int ARRAY_TYPE__DIMENSIONS = TYPE_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The feature id for the 'Element Type' containment reference.
>@@ -1758,7 +2012,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ARRAY_TYPE__ELEMENT_TYPE = TYPE_FEATURE_COUNT + 2;
>+	int ARRAY_TYPE__ELEMENT_TYPE = TYPE_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The number of structural features of the 'Array Type' class.
>@@ -1767,7 +2021,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int ARRAY_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 3;
>+	int ARRAY_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.AssignmentImpl Assignment}' class.
>@@ -1777,7 +2031,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAssignment()
> 	 * @generated
> 	 */
>-	int ASSIGNMENT = 17;
>+	int ASSIGNMENT = 18;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1798,6 +2052,15 @@
> 	int ASSIGNMENT__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ASSIGNMENT__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Left Hand Side' containment reference.
> 	 * 
> 	 * 
>@@ -1841,7 +2104,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getBooleanLiteral()
> 	 * @generated
> 	 */
>-	int BOOLEAN_LITERAL = 19;
>+	int BOOLEAN_LITERAL = 20;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1862,6 +2125,15 @@
> 	int BOOLEAN_LITERAL__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int BOOLEAN_LITERAL__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Value' attribute.
> 	 * 
> 	 * 
>@@ -1887,7 +2159,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getComment()
> 	 * @generated
> 	 */
>-	int COMMENT = 31;
>+	int COMMENT = 33;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1908,6 +2180,15 @@
> 	int COMMENT__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMMENT__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Content' attribute.
> 	 * 
> 	 * 
>@@ -1951,7 +2232,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getBlockComment()
> 	 * @generated
> 	 */
>-	int BLOCK_COMMENT = 20;
>+	int BLOCK_COMMENT = 21;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -1972,6 +2253,15 @@
> 	int BLOCK_COMMENT__ORIGINAL_COMPILATION_UNIT = COMMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int BLOCK_COMMENT__ORIGINAL_CLASS_FILE = COMMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Content' attribute.
> 	 * 
> 	 * 
>@@ -2015,7 +2305,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getBlock()
> 	 * @generated
> 	 */
>-	int BLOCK = 21;
>+	int BLOCK = 22;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2036,6 +2326,15 @@
> 	int BLOCK__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int BLOCK__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Statements' containment reference list.
> 	 * 
> 	 * 
>@@ -2061,7 +2360,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getBreakStatement()
> 	 * @generated
> 	 */
>-	int BREAK_STATEMENT = 22;
>+	int BREAK_STATEMENT = 23;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2082,6 +2381,15 @@
> 	int BREAK_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int BREAK_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Label' reference.
> 	 * 
> 	 * 
>@@ -2107,7 +2415,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getCastExpression()
> 	 * @generated
> 	 */
>-	int CAST_EXPRESSION = 23;
>+	int CAST_EXPRESSION = 24;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2128,6 +2436,15 @@
> 	int CAST_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CAST_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -2162,7 +2479,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getCatchClause()
> 	 * @generated
> 	 */
>-	int CATCH_CLAUSE = 24;
>+	int CATCH_CLAUSE = 25;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2183,6 +2500,15 @@
> 	int CATCH_CLAUSE__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CATCH_CLAUSE__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Exception' containment reference.
> 	 * 
> 	 * 
>@@ -2217,7 +2543,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getCharacterLiteral()
> 	 * @generated
> 	 */
>-	int CHARACTER_LITERAL = 25;
>+	int CHARACTER_LITERAL = 26;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2238,6 +2564,15 @@
> 	int CHARACTER_LITERAL__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CHARACTER_LITERAL__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Escaped Value' attribute.
> 	 * 
> 	 * 
>@@ -2256,6 +2591,115 @@
> 	int CHARACTER_LITERAL_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 1;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ClassFileImpl Class File}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.ClassFileImpl
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getClassFile()
>+	 * @generated
>+	 */
>+	int CLASS_FILE = 27;
>+
>+	/**
>+	 * The feature id for the 'Comments' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__COMMENTS = NAMED_ELEMENT__COMMENTS;
>+
>+	/**
>+	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
>+	 * The feature id for the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__NAME = NAMED_ELEMENT__NAME;
>+
>+	/**
>+	 * The feature id for the 'Proxy' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__PROXY = NAMED_ELEMENT__PROXY;
>+
>+	/**
>+	 * The feature id for the 'Usages In Imports' reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__USAGES_IN_IMPORTS = NAMED_ELEMENT__USAGES_IN_IMPORTS;
>+
>+	/**
>+	 * The feature id for the 'Original File Path' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__ORIGINAL_FILE_PATH = NAMED_ELEMENT_FEATURE_COUNT + 0;
>+
>+	/**
>+	 * The feature id for the 'Type' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__TYPE = NAMED_ELEMENT_FEATURE_COUNT + 1;
>+
>+	/**
>+	 * The feature id for the 'Attached Source' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__ATTACHED_SOURCE = NAMED_ELEMENT_FEATURE_COUNT + 2;
>+
>+	/**
>+	 * The feature id for the 'Package' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE__PACKAGE = NAMED_ELEMENT_FEATURE_COUNT + 3;
>+
>+	/**
>+	 * The number of structural features of the 'Class File' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_FILE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 4;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ClassInstanceCreationImpl Class Instance Creation}' class.
> 	 * 
> 	 * 
>@@ -2263,7 +2707,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getClassInstanceCreation()
> 	 * @generated
> 	 */
>-	int CLASS_INSTANCE_CREATION = 26;
>+	int CLASS_INSTANCE_CREATION = 28;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2284,6 +2728,15 @@
> 	int CLASS_INSTANCE_CREATION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_INSTANCE_CREATION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Method' reference.
> 	 * 
> 	 * 
>@@ -2354,7 +2807,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getConstructorDeclaration()
> 	 * @generated
> 	 */
>-	int CONSTRUCTOR_DECLARATION = 27;
>+	int CONSTRUCTOR_DECLARATION = 29;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2375,6 +2828,15 @@
> 	int CONSTRUCTOR_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_METHOD_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONSTRUCTOR_DECLARATION__ORIGINAL_CLASS_FILE = ABSTRACT_METHOD_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -2438,24 +2900,6 @@
> 	int CONSTRUCTOR_DECLARATION__MODIFIER = ABSTRACT_METHOD_DECLARATION__MODIFIER;
> 
> 	/**
>-	 * The feature id for the 'Varargs' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONSTRUCTOR_DECLARATION__VARARGS = ABSTRACT_METHOD_DECLARATION__VARARGS;
>-
>-	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CONSTRUCTOR_DECLARATION__QUALIFIED_NAME = ABSTRACT_METHOD_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
>@@ -2526,7 +2970,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getConditionalExpression()
> 	 * @generated
> 	 */
>-	int CONDITIONAL_EXPRESSION = 28;
>+	int CONDITIONAL_EXPRESSION = 30;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2547,6 +2991,15 @@
> 	int CONDITIONAL_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONDITIONAL_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Else Expression' containment reference.
> 	 * 
> 	 * 
>@@ -2590,7 +3043,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getConstructorInvocation()
> 	 * @generated
> 	 */
>-	int CONSTRUCTOR_INVOCATION = 29;
>+	int CONSTRUCTOR_INVOCATION = 31;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2611,6 +3064,15 @@
> 	int CONSTRUCTOR_INVOCATION__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONSTRUCTOR_INVOCATION__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Method' reference.
> 	 * 
> 	 * 
>@@ -2654,7 +3116,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTypeDeclaration()
> 	 * @generated
> 	 */
>-	int TYPE_DECLARATION = 97;
>+	int TYPE_DECLARATION = 103;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2675,6 +3137,15 @@
> 	int TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TYPE_DECLARATION__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -2747,15 +3218,6 @@
> 	int TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS = ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int TYPE_DECLARATION__QUALIFIED_NAME = ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -2826,7 +3288,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getClassDeclaration()
> 	 * @generated
> 	 */
>-	int CLASS_DECLARATION = 30;
>+	int CLASS_DECLARATION = 32;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -2835,16 +3297,25 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CLASS_DECLARATION__COMMENTS = TYPE_DECLARATION__COMMENTS;
>+	int CLASS_DECLARATION__COMMENTS = TYPE_DECLARATION__COMMENTS;
>+
>+	/**
>+	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CLASS_DECLARATION__ORIGINAL_COMPILATION_UNIT = TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>-	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * The feature id for the 'Original Class File' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int CLASS_DECLARATION__ORIGINAL_COMPILATION_UNIT = TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
>+	int CLASS_DECLARATION__ORIGINAL_CLASS_FILE = TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
> 
> 	/**
> 	 * The feature id for the 'Name' attribute.
>@@ -2919,15 +3390,6 @@
> 	int CLASS_DECLARATION__USAGES_IN_TYPE_ACCESS = TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int CLASS_DECLARATION__QUALIFIED_NAME = TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -3007,7 +3469,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getCompilationUnit()
> 	 * @generated
> 	 */
>-	int COMPILATION_UNIT = 32;
>+	int COMPILATION_UNIT = 34;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3028,6 +3490,15 @@
> 	int COMPILATION_UNIT__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int COMPILATION_UNIT__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -3116,7 +3587,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getContinueStatement()
> 	 * @generated
> 	 */
>-	int CONTINUE_STATEMENT = 33;
>+	int CONTINUE_STATEMENT = 35;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3137,6 +3608,15 @@
> 	int CONTINUE_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int CONTINUE_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Label' reference.
> 	 * 
> 	 * 
>@@ -3162,7 +3642,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getDoStatement()
> 	 * @generated
> 	 */
>-	int DO_STATEMENT = 34;
>+	int DO_STATEMENT = 36;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3183,6 +3663,15 @@
> 	int DO_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int DO_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -3217,7 +3706,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getEmptyStatement()
> 	 * @generated
> 	 */
>-	int EMPTY_STATEMENT = 35;
>+	int EMPTY_STATEMENT = 37;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3238,6 +3727,15 @@
> 	int EMPTY_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int EMPTY_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The number of structural features of the 'Empty Statement' class.
> 	 * 
> 	 * 
>@@ -3254,7 +3752,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getEnhancedForStatement()
> 	 * @generated
> 	 */
>-	int ENHANCED_FOR_STATEMENT = 36;
>+	int ENHANCED_FOR_STATEMENT = 38;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3275,6 +3773,15 @@
> 	int ENHANCED_FOR_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ENHANCED_FOR_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
>@@ -3318,7 +3825,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getEnumConstantDeclaration()
> 	 * @generated
> 	 */
>-	int ENUM_CONSTANT_DECLARATION = 37;
>+	int ENUM_CONSTANT_DECLARATION = 39;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3339,6 +3846,15 @@
> 	int ENUM_CONSTANT_DECLARATION__ORIGINAL_COMPILATION_UNIT = BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ENUM_CONSTANT_DECLARATION__ORIGINAL_CLASS_FILE = BODY_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -3463,7 +3979,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getEnumDeclaration()
> 	 * @generated
> 	 */
>-	int ENUM_DECLARATION = 38;
>+	int ENUM_DECLARATION = 40;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3484,6 +4000,15 @@
> 	int ENUM_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int ENUM_DECLARATION__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -3556,15 +4081,6 @@
> 	int ENUM_DECLARATION__USAGES_IN_TYPE_ACCESS = ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int ENUM_DECLARATION__QUALIFIED_NAME = ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -3635,7 +4151,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getExpressionStatement()
> 	 * @generated
> 	 */
>-	int EXPRESSION_STATEMENT = 40;
>+	int EXPRESSION_STATEMENT = 42;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3656,6 +4172,15 @@
> 	int EXPRESSION_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int EXPRESSION_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -3681,7 +4206,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getFieldAccess()
> 	 * @generated
> 	 */
>-	int FIELD_ACCESS = 41;
>+	int FIELD_ACCESS = 43;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3702,6 +4227,15 @@
> 	int FIELD_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int FIELD_ACCESS__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Field' containment reference.
> 	 * 
> 	 * 
>@@ -3736,7 +4270,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getFieldDeclaration()
> 	 * @generated
> 	 */
>-	int FIELD_DECLARATION = 42;
>+	int FIELD_DECLARATION = 44;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3757,6 +4291,15 @@
> 	int FIELD_DECLARATION__ORIGINAL_COMPILATION_UNIT = BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int FIELD_DECLARATION__ORIGINAL_CLASS_FILE = BODY_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -3854,7 +4397,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getForStatement()
> 	 * @generated
> 	 */
>-	int FOR_STATEMENT = 43;
>+	int FOR_STATEMENT = 45;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3875,6 +4418,15 @@
> 	int FOR_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int FOR_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -3927,7 +4479,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getIfStatement()
> 	 * @generated
> 	 */
>-	int IF_STATEMENT = 44;
>+	int IF_STATEMENT = 46;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -3948,6 +4500,15 @@
> 	int IF_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int IF_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -3991,7 +4552,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getImportDeclaration()
> 	 * @generated
> 	 */
>-	int IMPORT_DECLARATION = 45;
>+	int IMPORT_DECLARATION = 47;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4012,6 +4573,15 @@
> 	int IMPORT_DECLARATION__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int IMPORT_DECLARATION__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Static' attribute.
> 	 * 
> 	 * 
>@@ -4046,7 +4616,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getInfixExpression()
> 	 * @generated
> 	 */
>-	int INFIX_EXPRESSION = 46;
>+	int INFIX_EXPRESSION = 48;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4067,6 +4637,15 @@
> 	int INFIX_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int INFIX_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Operator' attribute.
> 	 * 
> 	 * 
>@@ -4119,7 +4698,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getInitializer()
> 	 * @generated
> 	 */
>-	int INITIALIZER = 47;
>+	int INITIALIZER = 49;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4140,6 +4719,15 @@
> 	int INITIALIZER__ORIGINAL_COMPILATION_UNIT = BODY_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int INITIALIZER__ORIGINAL_CLASS_FILE = BODY_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -4228,7 +4816,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getInstanceofExpression()
> 	 * @generated
> 	 */
>-	int INSTANCEOF_EXPRESSION = 48;
>+	int INSTANCEOF_EXPRESSION = 50;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4249,6 +4837,15 @@
> 	int INSTANCEOF_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int INSTANCEOF_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Right Operand' containment reference.
> 	 * 
> 	 * 
>@@ -4283,7 +4880,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getInterfaceDeclaration()
> 	 * @generated
> 	 */
>-	int INTERFACE_DECLARATION = 49;
>+	int INTERFACE_DECLARATION = 51;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4304,6 +4901,15 @@
> 	int INTERFACE_DECLARATION__ORIGINAL_COMPILATION_UNIT = TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int INTERFACE_DECLARATION__ORIGINAL_CLASS_FILE = TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -4376,15 +4982,6 @@
> 	int INTERFACE_DECLARATION__USAGES_IN_TYPE_ACCESS = TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int INTERFACE_DECLARATION__QUALIFIED_NAME = TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -4455,7 +5052,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getJavadoc()
> 	 * @generated
> 	 */
>-	int JAVADOC = 50;
>+	int JAVADOC = 52;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4476,6 +5073,15 @@
> 	int JAVADOC__ORIGINAL_COMPILATION_UNIT = COMMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int JAVADOC__ORIGINAL_CLASS_FILE = COMMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Content' attribute.
> 	 * 
> 	 * 
>@@ -4528,7 +5134,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getLabeledStatement()
> 	 * @generated
> 	 */
>-	int LABELED_STATEMENT = 51;
>+	int LABELED_STATEMENT = 53;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4549,6 +5155,15 @@
> 	int LABELED_STATEMENT__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int LABELED_STATEMENT__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -4619,7 +5234,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getLineComment()
> 	 * @generated
> 	 */
>-	int LINE_COMMENT = 52;
>+	int LINE_COMMENT = 54;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4640,6 +5255,15 @@
> 	int LINE_COMMENT__ORIGINAL_COMPILATION_UNIT = COMMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int LINE_COMMENT__ORIGINAL_CLASS_FILE = COMMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Content' attribute.
> 	 * 
> 	 * 
>@@ -4676,6 +5300,117 @@
> 	int LINE_COMMENT_FEATURE_COUNT = COMMENT_FEATURE_COUNT + 0;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestImpl Manifest}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.ManifestImpl
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getManifest()
>+	 * @generated
>+	 */
>+	int MANIFEST = 55;
>+
>+	/**
>+	 * The feature id for the 'Main Attributes' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST__MAIN_ATTRIBUTES = 0;
>+
>+	/**
>+	 * The feature id for the 'Entry Attributes' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST__ENTRY_ATTRIBUTES = 1;
>+
>+	/**
>+	 * The number of structural features of the 'Manifest' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_FEATURE_COUNT = 2;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestAttributeImpl Manifest Attribute}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.ManifestAttributeImpl
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getManifestAttribute()
>+	 * @generated
>+	 */
>+	int MANIFEST_ATTRIBUTE = 56;
>+
>+	/**
>+	 * The feature id for the 'Key' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_ATTRIBUTE__KEY = 0;
>+
>+	/**
>+	 * The feature id for the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_ATTRIBUTE__VALUE = 1;
>+
>+	/**
>+	 * The number of structural features of the 'Manifest Attribute' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_ATTRIBUTE_FEATURE_COUNT = 2;
>+
>+	/**
>+	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ManifestEntryImpl Manifest Entry}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.ManifestEntryImpl
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getManifestEntry()
>+	 * @generated
>+	 */
>+	int MANIFEST_ENTRY = 57;
>+
>+	/**
>+	 * The feature id for the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_ENTRY__NAME = 0;
>+
>+	/**
>+	 * The feature id for the 'Attributes' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_ENTRY__ATTRIBUTES = 1;
>+
>+	/**
>+	 * The number of structural features of the 'Manifest Entry' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MANIFEST_ENTRY_FEATURE_COUNT = 2;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.MemberRefImpl Member Ref}' class.
> 	 * 
> 	 * 
>@@ -4683,7 +5418,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getMemberRef()
> 	 * @generated
> 	 */
>-	int MEMBER_REF = 53;
>+	int MEMBER_REF = 58;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4695,13 +5430,22 @@
> 	int MEMBER_REF__COMMENTS = AST_NODE__COMMENTS;
> 
> 	/**
>-	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MEMBER_REF__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MEMBER_REF__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
>+	int MEMBER_REF__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
> 
> 	/**
> 	 * The feature id for the 'Member' reference.
>@@ -4738,7 +5482,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getMethodDeclaration()
> 	 * @generated
> 	 */
>-	int METHOD_DECLARATION = 54;
>+	int METHOD_DECLARATION = 59;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4759,6 +5503,15 @@
> 	int METHOD_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_METHOD_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int METHOD_DECLARATION__ORIGINAL_CLASS_FILE = ABSTRACT_METHOD_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -4822,24 +5575,6 @@
> 	int METHOD_DECLARATION__MODIFIER = ABSTRACT_METHOD_DECLARATION__MODIFIER;
> 
> 	/**
>-	 * The feature id for the 'Varargs' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int METHOD_DECLARATION__VARARGS = ABSTRACT_METHOD_DECLARATION__VARARGS;
>-
>-	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int METHOD_DECLARATION__QUALIFIED_NAME = ABSTRACT_METHOD_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
>@@ -4946,7 +5681,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getMethodInvocation()
> 	 * @generated
> 	 */
>-	int METHOD_INVOCATION = 55;
>+	int METHOD_INVOCATION = 60;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -4967,6 +5702,15 @@
> 	int METHOD_INVOCATION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int METHOD_INVOCATION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Method' reference.
> 	 * 
> 	 * 
>@@ -5019,7 +5763,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getMethodRef()
> 	 * @generated
> 	 */
>-	int METHOD_REF = 56;
>+	int METHOD_REF = 61;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5040,6 +5784,15 @@
> 	int METHOD_REF__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int METHOD_REF__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Method' reference.
> 	 * 
> 	 * 
>@@ -5083,7 +5836,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getMethodRefParameter()
> 	 * @generated
> 	 */
>-	int METHOD_REF_PARAMETER = 57;
>+	int METHOD_REF_PARAMETER = 62;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5104,6 +5857,15 @@
> 	int METHOD_REF_PARAMETER__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int METHOD_REF_PARAMETER__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -5147,7 +5909,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getModel()
> 	 * @generated
> 	 */
>-	int MODEL = 58;
>+	int MODEL = 63;
> 
> 	/**
> 	 * The feature id for the 'Name' attribute.
>@@ -5195,13 +5957,31 @@
> 	int MODEL__COMPILATION_UNITS = 4;
> 
> 	/**
>+	 * The feature id for the 'Class Files' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MODEL__CLASS_FILES = 5;
>+
>+	/**
>+	 * The feature id for the 'Archives' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MODEL__ARCHIVES = 6;
>+
>+	/**
> 	 * The number of structural features of the 'Model' class.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int MODEL_FEATURE_COUNT = 5;
>+	int MODEL_FEATURE_COUNT = 7;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ModifierImpl Modifier}' class.
>@@ -5211,7 +5991,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getModifier()
> 	 * @generated
> 	 */
>-	int MODIFIER = 59;
>+	int MODIFIER = 64;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5232,6 +6012,15 @@
> 	int MODIFIER__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int MODIFIER__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Visibility' attribute.
> 	 * 
> 	 * 
>@@ -5349,6 +6138,52 @@
> 	int MODIFIER_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 12;
> 
> 	/**
>+	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.NamespaceAccessImpl Namespace Access}' class.
>+	 * 
>+	 * 
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.NamespaceAccessImpl
>+	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getNamespaceAccess()
>+	 * @generated
>+	 */
>+	int NAMESPACE_ACCESS = 66;
>+
>+	/**
>+	 * The feature id for the 'Comments' containment reference list.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NAMESPACE_ACCESS__COMMENTS = AST_NODE__COMMENTS;
>+
>+	/**
>+	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NAMESPACE_ACCESS__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NAMESPACE_ACCESS__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
>+	 * The number of structural features of the 'Namespace Access' class.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NAMESPACE_ACCESS_FEATURE_COUNT = AST_NODE_FEATURE_COUNT + 0;
>+
>+	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.NumberLiteralImpl Number Literal}' class.
> 	 * 
> 	 * 
>@@ -5356,7 +6191,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getNumberLiteral()
> 	 * @generated
> 	 */
>-	int NUMBER_LITERAL = 61;
>+	int NUMBER_LITERAL = 67;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5377,6 +6212,15 @@
> 	int NUMBER_LITERAL__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NUMBER_LITERAL__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Token Value' attribute.
> 	 * 
> 	 * 
>@@ -5402,7 +6246,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getNullLiteral()
> 	 * @generated
> 	 */
>-	int NULL_LITERAL = 62;
>+	int NULL_LITERAL = 68;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5423,6 +6267,15 @@
> 	int NULL_LITERAL__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int NULL_LITERAL__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The number of structural features of the 'Null Literal' class.
> 	 * 
> 	 * 
>@@ -5439,7 +6292,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPackage()
> 	 * @generated
> 	 */
>-	int PACKAGE = 63;
>+	int PACKAGE = 69;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5460,40 +6313,40 @@
> 	int PACKAGE__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>-	 * The feature id for the 'Name' attribute.
>+	 * The feature id for the 'Original Class File' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__NAME = NAMED_ELEMENT__NAME;
>+	int PACKAGE__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
> 
> 	/**
>-	 * The feature id for the 'Proxy' attribute.
>+	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__PROXY = NAMED_ELEMENT__PROXY;
>+	int PACKAGE__NAME = NAMED_ELEMENT__NAME;
> 
> 	/**
>-	 * The feature id for the 'Usages In Imports' reference list.
>+	 * The feature id for the 'Proxy' attribute.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__USAGES_IN_IMPORTS = NAMED_ELEMENT__USAGES_IN_IMPORTS;
>+	int PACKAGE__PROXY = NAMED_ELEMENT__PROXY;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>+	 * The feature id for the 'Usages In Imports' reference list.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__QUALIFIED_NAME = NAMED_ELEMENT_FEATURE_COUNT + 0;
>+	int PACKAGE__USAGES_IN_IMPORTS = NAMED_ELEMENT__USAGES_IN_IMPORTS;
> 
> 	/**
> 	 * The feature id for the 'Owned Elements' containment reference list.
>@@ -5502,7 +6355,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__OWNED_ELEMENTS = NAMED_ELEMENT_FEATURE_COUNT + 1;
>+	int PACKAGE__OWNED_ELEMENTS = NAMED_ELEMENT_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The feature id for the 'Model' container reference.
>@@ -5511,7 +6364,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__MODEL = NAMED_ELEMENT_FEATURE_COUNT + 2;
>+	int PACKAGE__MODEL = NAMED_ELEMENT_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The feature id for the 'Owned Packages' containment reference list.
>@@ -5520,7 +6373,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__OWNED_PACKAGES = NAMED_ELEMENT_FEATURE_COUNT + 3;
>+	int PACKAGE__OWNED_PACKAGES = NAMED_ELEMENT_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The feature id for the 'Package' container reference.
>@@ -5529,7 +6382,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__PACKAGE = NAMED_ELEMENT_FEATURE_COUNT + 4;
>+	int PACKAGE__PACKAGE = NAMED_ELEMENT_FEATURE_COUNT + 3;
> 
> 	/**
> 	 * The feature id for the 'Usages In Package Access' reference list.
>@@ -5538,7 +6391,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE__USAGES_IN_PACKAGE_ACCESS = NAMED_ELEMENT_FEATURE_COUNT + 5;
>+	int PACKAGE__USAGES_IN_PACKAGE_ACCESS = NAMED_ELEMENT_FEATURE_COUNT + 4;
> 
> 	/**
> 	 * The number of structural features of the 'Package' class.
>@@ -5547,7 +6400,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 6;
>+	int PACKAGE_FEATURE_COUNT = NAMED_ELEMENT_FEATURE_COUNT + 5;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.PackageAccessImpl Package Access}' class.
>@@ -5557,7 +6410,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPackageAccess()
> 	 * @generated
> 	 */
>-	int PACKAGE_ACCESS = 64;
>+	int PACKAGE_ACCESS = 70;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5566,7 +6419,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE_ACCESS__COMMENTS = EXPRESSION__COMMENTS;
>+	int PACKAGE_ACCESS__COMMENTS = NAMESPACE_ACCESS__COMMENTS;
> 
> 	/**
> 	 * The feature id for the 'Original Compilation Unit' reference.
>@@ -5575,7 +6428,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
>+	int PACKAGE_ACCESS__ORIGINAL_COMPILATION_UNIT = NAMESPACE_ACCESS__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PACKAGE_ACCESS__ORIGINAL_CLASS_FILE = NAMESPACE_ACCESS__ORIGINAL_CLASS_FILE;
> 
> 	/**
> 	 * The feature id for the 'Package' reference.
>@@ -5584,7 +6446,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE_ACCESS__PACKAGE = EXPRESSION_FEATURE_COUNT + 0;
>+	int PACKAGE_ACCESS__PACKAGE = NAMESPACE_ACCESS_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The feature id for the 'Qualifier' containment reference.
>@@ -5593,7 +6455,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE_ACCESS__QUALIFIER = EXPRESSION_FEATURE_COUNT + 1;
>+	int PACKAGE_ACCESS__QUALIFIER = NAMESPACE_ACCESS_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The number of structural features of the 'Package Access' class.
>@@ -5602,7 +6464,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PACKAGE_ACCESS_FEATURE_COUNT = EXPRESSION_FEATURE_COUNT + 2;
>+	int PACKAGE_ACCESS_FEATURE_COUNT = NAMESPACE_ACCESS_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ParameterizedTypeImpl Parameterized Type}' class.
>@@ -5612,7 +6474,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getParameterizedType()
> 	 * @generated
> 	 */
>-	int PARAMETERIZED_TYPE = 65;
>+	int PARAMETERIZED_TYPE = 71;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5633,6 +6495,15 @@
> 	int PARAMETERIZED_TYPE__ORIGINAL_COMPILATION_UNIT = TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PARAMETERIZED_TYPE__ORIGINAL_CLASS_FILE = TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -5669,22 +6540,13 @@
> 	int PARAMETERIZED_TYPE__USAGES_IN_TYPE_ACCESS = TYPE__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int PARAMETERIZED_TYPE__QUALIFIED_NAME = TYPE_FEATURE_COUNT + 0;
>-
>-	/**
> 	 * The feature id for the 'Type' containment reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PARAMETERIZED_TYPE__TYPE = TYPE_FEATURE_COUNT + 1;
>+	int PARAMETERIZED_TYPE__TYPE = TYPE_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The feature id for the 'Type Arguments' containment reference list.
>@@ -5693,7 +6555,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PARAMETERIZED_TYPE__TYPE_ARGUMENTS = TYPE_FEATURE_COUNT + 2;
>+	int PARAMETERIZED_TYPE__TYPE_ARGUMENTS = TYPE_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The number of structural features of the 'Parameterized Type' class.
>@@ -5702,7 +6564,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int PARAMETERIZED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 3;
>+	int PARAMETERIZED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 2;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.ParenthesizedExpressionImpl Parenthesized Expression}' class.
>@@ -5712,7 +6574,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getParenthesizedExpression()
> 	 * @generated
> 	 */
>-	int PARENTHESIZED_EXPRESSION = 66;
>+	int PARENTHESIZED_EXPRESSION = 72;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5733,6 +6595,15 @@
> 	int PARENTHESIZED_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PARENTHESIZED_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -5758,7 +6629,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPostfixExpression()
> 	 * @generated
> 	 */
>-	int POSTFIX_EXPRESSION = 67;
>+	int POSTFIX_EXPRESSION = 73;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5779,6 +6650,15 @@
> 	int POSTFIX_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int POSTFIX_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Operator' attribute.
> 	 * 
> 	 * 
>@@ -5813,7 +6693,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrefixExpression()
> 	 * @generated
> 	 */
>-	int PREFIX_EXPRESSION = 68;
>+	int PREFIX_EXPRESSION = 74;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5834,6 +6714,15 @@
> 	int PREFIX_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PREFIX_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Operator' attribute.
> 	 * 
> 	 * 
>@@ -5868,7 +6757,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveType()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE = 69;
>+	int PRIMITIVE_TYPE = 75;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5889,6 +6778,15 @@
> 	int PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT = TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE = TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -5941,7 +6839,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeBoolean()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_BOOLEAN = 70;
>+	int PRIMITIVE_TYPE_BOOLEAN = 76;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -5962,6 +6860,15 @@
> 	int PRIMITIVE_TYPE_BOOLEAN__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_BOOLEAN__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6014,7 +6921,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeByte()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_BYTE = 71;
>+	int PRIMITIVE_TYPE_BYTE = 77;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6035,6 +6942,15 @@
> 	int PRIMITIVE_TYPE_BYTE__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_BYTE__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6087,7 +7003,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeChar()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_CHAR = 72;
>+	int PRIMITIVE_TYPE_CHAR = 78;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6108,6 +7024,15 @@
> 	int PRIMITIVE_TYPE_CHAR__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_CHAR__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6160,7 +7085,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeDouble()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_DOUBLE = 73;
>+	int PRIMITIVE_TYPE_DOUBLE = 79;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6181,6 +7106,15 @@
> 	int PRIMITIVE_TYPE_DOUBLE__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_DOUBLE__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6233,7 +7167,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeShort()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_SHORT = 74;
>+	int PRIMITIVE_TYPE_SHORT = 80;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6254,6 +7188,15 @@
> 	int PRIMITIVE_TYPE_SHORT__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_SHORT__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6306,7 +7249,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeFloat()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_FLOAT = 75;
>+	int PRIMITIVE_TYPE_FLOAT = 81;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6327,6 +7270,15 @@
> 	int PRIMITIVE_TYPE_FLOAT__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_FLOAT__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6379,7 +7331,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeInt()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_INT = 76;
>+	int PRIMITIVE_TYPE_INT = 82;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6400,6 +7352,15 @@
> 	int PRIMITIVE_TYPE_INT__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_INT__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6452,7 +7413,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeLong()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_LONG = 77;
>+	int PRIMITIVE_TYPE_LONG = 83;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6473,6 +7434,15 @@
> 	int PRIMITIVE_TYPE_LONG__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_LONG__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6525,7 +7495,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrimitiveTypeVoid()
> 	 * @generated
> 	 */
>-	int PRIMITIVE_TYPE_VOID = 78;
>+	int PRIMITIVE_TYPE_VOID = 84;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6546,6 +7516,15 @@
> 	int PRIMITIVE_TYPE_VOID__ORIGINAL_COMPILATION_UNIT = PRIMITIVE_TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int PRIMITIVE_TYPE_VOID__ORIGINAL_CLASS_FILE = PRIMITIVE_TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6598,7 +7577,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getReturnStatement()
> 	 * @generated
> 	 */
>-	int RETURN_STATEMENT = 79;
>+	int RETURN_STATEMENT = 85;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6619,6 +7598,15 @@
> 	int RETURN_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int RETURN_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -6644,7 +7632,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSingleVariableAccess()
> 	 * @generated
> 	 */
>-	int SINGLE_VARIABLE_ACCESS = 80;
>+	int SINGLE_VARIABLE_ACCESS = 86;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6662,7 +7650,16 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int SINGLE_VARIABLE_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
>+	int SINGLE_VARIABLE_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SINGLE_VARIABLE_ACCESS__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
> 
> 	/**
> 	 * The feature id for the 'Variable' reference.
>@@ -6699,7 +7696,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getVariableDeclaration()
> 	 * @generated
> 	 */
>-	int VARIABLE_DECLARATION = 114;
>+	int VARIABLE_DECLARATION = 120;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6720,6 +7717,15 @@
> 	int VARIABLE_DECLARATION__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int VARIABLE_DECLARATION__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6790,7 +7796,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSingleVariableDeclaration()
> 	 * @generated
> 	 */
>-	int SINGLE_VARIABLE_DECLARATION = 81;
>+	int SINGLE_VARIABLE_DECLARATION = 87;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6811,6 +7817,15 @@
> 	int SINGLE_VARIABLE_DECLARATION__ORIGINAL_COMPILATION_UNIT = VARIABLE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SINGLE_VARIABLE_DECLARATION__ORIGINAL_CLASS_FILE = VARIABLE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -6944,7 +7959,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getStringLiteral()
> 	 * @generated
> 	 */
>-	int STRING_LITERAL = 83;
>+	int STRING_LITERAL = 89;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -6965,6 +7980,15 @@
> 	int STRING_LITERAL__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int STRING_LITERAL__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Escaped Value' attribute.
> 	 * 
> 	 * 
>@@ -6990,7 +8014,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSuperConstructorInvocation()
> 	 * @generated
> 	 */
>-	int SUPER_CONSTRUCTOR_INVOCATION = 84;
>+	int SUPER_CONSTRUCTOR_INVOCATION = 90;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7011,6 +8035,15 @@
> 	int SUPER_CONSTRUCTOR_INVOCATION__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SUPER_CONSTRUCTOR_INVOCATION__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Method' reference.
> 	 * 
> 	 * 
>@@ -7063,7 +8096,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSuperFieldAccess()
> 	 * @generated
> 	 */
>-	int SUPER_FIELD_ACCESS = 85;
>+	int SUPER_FIELD_ACCESS = 91;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7084,6 +8117,15 @@
> 	int SUPER_FIELD_ACCESS__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SUPER_FIELD_ACCESS__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Qualifier' containment reference.
> 	 * 
> 	 * 
>@@ -7118,7 +8160,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSuperMethodInvocation()
> 	 * @generated
> 	 */
>-	int SUPER_METHOD_INVOCATION = 86;
>+	int SUPER_METHOD_INVOCATION = 92;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7139,6 +8181,15 @@
> 	int SUPER_METHOD_INVOCATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SUPER_METHOD_INVOCATION__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Qualifier' containment reference.
> 	 * 
> 	 * 
>@@ -7191,7 +8242,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSwitchCase()
> 	 * @generated
> 	 */
>-	int SWITCH_CASE = 87;
>+	int SWITCH_CASE = 93;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7212,6 +8263,15 @@
> 	int SWITCH_CASE__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SWITCH_CASE__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Default' attribute.
> 	 * 
> 	 * 
>@@ -7246,7 +8306,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSwitchStatement()
> 	 * @generated
> 	 */
>-	int SWITCH_STATEMENT = 88;
>+	int SWITCH_STATEMENT = 94;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7267,6 +8327,15 @@
> 	int SWITCH_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SWITCH_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -7301,7 +8370,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getSynchronizedStatement()
> 	 * @generated
> 	 */
>-	int SYNCHRONIZED_STATEMENT = 89;
>+	int SYNCHRONIZED_STATEMENT = 95;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7322,6 +8391,15 @@
> 	int SYNCHRONIZED_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int SYNCHRONIZED_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
>@@ -7356,7 +8434,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTagElement()
> 	 * @generated
> 	 */
>-	int TAG_ELEMENT = 90;
>+	int TAG_ELEMENT = 96;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7377,6 +8455,15 @@
> 	int TAG_ELEMENT__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TAG_ELEMENT__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Tag Name' attribute.
> 	 * 
> 	 * 
>@@ -7411,7 +8498,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTextElement()
> 	 * @generated
> 	 */
>-	int TEXT_ELEMENT = 91;
>+	int TEXT_ELEMENT = 97;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7432,6 +8519,15 @@
> 	int TEXT_ELEMENT__ORIGINAL_COMPILATION_UNIT = AST_NODE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TEXT_ELEMENT__ORIGINAL_CLASS_FILE = AST_NODE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Text' attribute.
> 	 * 
> 	 * 
>@@ -7457,7 +8553,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getThisExpression()
> 	 * @generated
> 	 */
>-	int THIS_EXPRESSION = 92;
>+	int THIS_EXPRESSION = 98;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7478,6 +8574,15 @@
> 	int THIS_EXPRESSION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int THIS_EXPRESSION__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_QUALIFIED_EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Qualifier' containment reference.
> 	 * 
> 	 * 
>@@ -7503,7 +8608,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getThrowStatement()
> 	 * @generated
> 	 */
>-	int THROW_STATEMENT = 93;
>+	int THROW_STATEMENT = 99;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7524,6 +8629,15 @@
> 	int THROW_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int THROW_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -7549,7 +8663,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTryStatement()
> 	 * @generated
> 	 */
>-	int TRY_STATEMENT = 94;
>+	int TRY_STATEMENT = 100;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7570,6 +8684,15 @@
> 	int TRY_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TRY_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
>@@ -7613,7 +8736,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTypeAccess()
> 	 * @generated
> 	 */
>-	int TYPE_ACCESS = 96;
>+	int TYPE_ACCESS = 102;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7634,6 +8757,15 @@
> 	int TYPE_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TYPE_ACCESS__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Type' reference.
> 	 * 
> 	 * 
>@@ -7668,7 +8800,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTypeDeclarationStatement()
> 	 * @generated
> 	 */
>-	int TYPE_DECLARATION_STATEMENT = 98;
>+	int TYPE_DECLARATION_STATEMENT = 104;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7689,6 +8821,15 @@
> 	int TYPE_DECLARATION_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TYPE_DECLARATION_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Declaration' containment reference.
> 	 * 
> 	 * 
>@@ -7714,7 +8855,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTypeLiteral()
> 	 * @generated
> 	 */
>-	int TYPE_LITERAL = 99;
>+	int TYPE_LITERAL = 105;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7735,6 +8876,15 @@
> 	int TYPE_LITERAL__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TYPE_LITERAL__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Type' containment reference.
> 	 * 
> 	 * 
>@@ -7760,7 +8910,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getTypeParameter()
> 	 * @generated
> 	 */
>-	int TYPE_PARAMETER = 100;
>+	int TYPE_PARAMETER = 106;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7781,6 +8931,15 @@
> 	int TYPE_PARAMETER__ORIGINAL_COMPILATION_UNIT = TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int TYPE_PARAMETER__ORIGINAL_CLASS_FILE = TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -7842,7 +9001,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedItem()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_ITEM = 101;
>+	int UNRESOLVED_ITEM = 107;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7863,6 +9022,15 @@
> 	int UNRESOLVED_ITEM__ORIGINAL_COMPILATION_UNIT = NAMED_ELEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_ITEM__ORIGINAL_CLASS_FILE = NAMED_ELEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -7906,7 +9074,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedItemAccess()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_ITEM_ACCESS = 102;
>+	int UNRESOLVED_ITEM_ACCESS = 108;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7927,6 +9095,15 @@
> 	int UNRESOLVED_ITEM_ACCESS__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_ITEM_ACCESS__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Element' reference.
> 	 * 
> 	 * 
>@@ -7961,7 +9138,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedAnnotationDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_ANNOTATION_DECLARATION = 103;
>+	int UNRESOLVED_ANNOTATION_DECLARATION = 109;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -7982,6 +9159,15 @@
> 	int UNRESOLVED_ANNOTATION_DECLARATION__ORIGINAL_COMPILATION_UNIT = ANNOTATION_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_ANNOTATION_DECLARATION__ORIGINAL_CLASS_FILE = ANNOTATION_TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8054,15 +9240,6 @@
> 	int UNRESOLVED_ANNOTATION_DECLARATION__USAGES_IN_TYPE_ACCESS = ANNOTATION_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_ANNOTATION_DECLARATION__QUALIFIED_NAME = ANNOTATION_TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -8124,7 +9301,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedAnnotationTypeMemberDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_ANNOTATION_TYPE_MEMBER_DECLARATION = 104;
>+	int UNRESOLVED_ANNOTATION_TYPE_MEMBER_DECLARATION = 110;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -8145,6 +9322,15 @@
> 	int UNRESOLVED_ANNOTATION_TYPE_MEMBER_DECLARATION__ORIGINAL_COMPILATION_UNIT = ANNOTATION_TYPE_MEMBER_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_ANNOTATION_TYPE_MEMBER_DECLARATION__ORIGINAL_CLASS_FILE = ANNOTATION_TYPE_MEMBER_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8251,7 +9437,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedClassDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_CLASS_DECLARATION = 105;
>+	int UNRESOLVED_CLASS_DECLARATION = 111;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -8272,6 +9458,15 @@
> 	int UNRESOLVED_CLASS_DECLARATION__ORIGINAL_COMPILATION_UNIT = CLASS_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_CLASS_DECLARATION__ORIGINAL_CLASS_FILE = CLASS_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8344,15 +9539,6 @@
> 	int UNRESOLVED_CLASS_DECLARATION__USAGES_IN_TYPE_ACCESS = CLASS_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_CLASS_DECLARATION__QUALIFIED_NAME = CLASS_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -8432,7 +9618,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedEnumDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_ENUM_DECLARATION = 106;
>+	int UNRESOLVED_ENUM_DECLARATION = 112;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -8453,6 +9639,15 @@
> 	int UNRESOLVED_ENUM_DECLARATION__ORIGINAL_COMPILATION_UNIT = ENUM_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_ENUM_DECLARATION__ORIGINAL_CLASS_FILE = ENUM_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8525,15 +9720,6 @@
> 	int UNRESOLVED_ENUM_DECLARATION__USAGES_IN_TYPE_ACCESS = ENUM_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_ENUM_DECLARATION__QUALIFIED_NAME = ENUM_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -8604,7 +9790,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedInterfaceDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_INTERFACE_DECLARATION = 107;
>+	int UNRESOLVED_INTERFACE_DECLARATION = 113;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -8625,6 +9811,15 @@
> 	int UNRESOLVED_INTERFACE_DECLARATION__ORIGINAL_COMPILATION_UNIT = INTERFACE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_INTERFACE_DECLARATION__ORIGINAL_CLASS_FILE = INTERFACE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8697,15 +9892,6 @@
> 	int UNRESOLVED_INTERFACE_DECLARATION__USAGES_IN_TYPE_ACCESS = INTERFACE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_INTERFACE_DECLARATION__QUALIFIED_NAME = INTERFACE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -8776,7 +9962,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedLabeledStatement()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_LABELED_STATEMENT = 108;
>+	int UNRESOLVED_LABELED_STATEMENT = 114;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -8797,6 +9983,15 @@
> 	int UNRESOLVED_LABELED_STATEMENT__ORIGINAL_COMPILATION_UNIT = LABELED_STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_LABELED_STATEMENT__ORIGINAL_CLASS_FILE = LABELED_STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8867,7 +10062,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedMethodDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_METHOD_DECLARATION = 109;
>+	int UNRESOLVED_METHOD_DECLARATION = 115;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -8888,6 +10083,15 @@
> 	int UNRESOLVED_METHOD_DECLARATION__ORIGINAL_COMPILATION_UNIT = METHOD_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_METHOD_DECLARATION__ORIGINAL_CLASS_FILE = METHOD_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -8951,24 +10155,6 @@
> 	int UNRESOLVED_METHOD_DECLARATION__MODIFIER = METHOD_DECLARATION__MODIFIER;
> 
> 	/**
>-	 * The feature id for the 'Varargs' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_METHOD_DECLARATION__VARARGS = METHOD_DECLARATION__VARARGS;
>-
>-	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_METHOD_DECLARATION__QUALIFIED_NAME = METHOD_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body' containment reference.
> 	 * 
> 	 * 
>@@ -9075,7 +10261,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedSingleVariableDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_SINGLE_VARIABLE_DECLARATION = 110;
>+	int UNRESOLVED_SINGLE_VARIABLE_DECLARATION = 116;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9096,6 +10282,15 @@
> 	int UNRESOLVED_SINGLE_VARIABLE_DECLARATION__ORIGINAL_COMPILATION_UNIT = SINGLE_VARIABLE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_SINGLE_VARIABLE_DECLARATION__ORIGINAL_CLASS_FILE = SINGLE_VARIABLE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -9229,7 +10424,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedType()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_TYPE = 111;
>+	int UNRESOLVED_TYPE = 117;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9250,6 +10445,15 @@
> 	int UNRESOLVED_TYPE__ORIGINAL_COMPILATION_UNIT = TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_TYPE__ORIGINAL_CLASS_FILE = TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -9302,7 +10506,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedTypeDeclaration()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_TYPE_DECLARATION = 112;
>+	int UNRESOLVED_TYPE_DECLARATION = 118;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9314,13 +10518,22 @@
> 	int UNRESOLVED_TYPE_DECLARATION__COMMENTS = ABSTRACT_TYPE_DECLARATION__COMMENTS;
> 
> 	/**
>-	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * The feature id for the 'Original Compilation Unit' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
>+
>+	/**
>+	 * The feature id for the 'Original Class File' reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int UNRESOLVED_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT = ABSTRACT_TYPE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
>+	int UNRESOLVED_TYPE_DECLARATION__ORIGINAL_CLASS_FILE = ABSTRACT_TYPE_DECLARATION__ORIGINAL_CLASS_FILE;
> 
> 	/**
> 	 * The feature id for the 'Name' attribute.
>@@ -9395,15 +10608,6 @@
> 	int UNRESOLVED_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS = ABSTRACT_TYPE_DECLARATION__USAGES_IN_TYPE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_TYPE_DECLARATION__QUALIFIED_NAME = ABSTRACT_TYPE_DECLARATION__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Body Declarations' containment reference list.
> 	 * 
> 	 * 
>@@ -9465,7 +10669,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getVariableDeclarationFragment()
> 	 * @generated
> 	 */
>-	int VARIABLE_DECLARATION_FRAGMENT = 116;
>+	int VARIABLE_DECLARATION_FRAGMENT = 122;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9486,6 +10690,15 @@
> 	int VARIABLE_DECLARATION_FRAGMENT__ORIGINAL_COMPILATION_UNIT = VARIABLE_DECLARATION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int VARIABLE_DECLARATION_FRAGMENT__ORIGINAL_CLASS_FILE = VARIABLE_DECLARATION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -9540,22 +10753,13 @@
> 	int VARIABLE_DECLARATION_FRAGMENT__USAGE_IN_VARIABLE_ACCESS = VARIABLE_DECLARATION__USAGE_IN_VARIABLE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int VARIABLE_DECLARATION_FRAGMENT__QUALIFIED_NAME = VARIABLE_DECLARATION_FEATURE_COUNT + 0;
>-
>-	/**
> 	 * The feature id for the 'Variables Container' container reference.
> 	 * 
> 	 * 
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int VARIABLE_DECLARATION_FRAGMENT__VARIABLES_CONTAINER = VARIABLE_DECLARATION_FEATURE_COUNT + 1;
>+	int VARIABLE_DECLARATION_FRAGMENT__VARIABLES_CONTAINER = VARIABLE_DECLARATION_FEATURE_COUNT + 0;
> 
> 	/**
> 	 * The number of structural features of the 'Variable Declaration Fragment' class.
>@@ -9564,7 +10768,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	int VARIABLE_DECLARATION_FRAGMENT_FEATURE_COUNT = VARIABLE_DECLARATION_FEATURE_COUNT + 2;
>+	int VARIABLE_DECLARATION_FRAGMENT_FEATURE_COUNT = VARIABLE_DECLARATION_FEATURE_COUNT + 1;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.emf.impl.UnresolvedVariableDeclarationFragmentImpl Unresolved Variable Declaration Fragment}' class.
>@@ -9574,7 +10778,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getUnresolvedVariableDeclarationFragment()
> 	 * @generated
> 	 */
>-	int UNRESOLVED_VARIABLE_DECLARATION_FRAGMENT = 113;
>+	int UNRESOLVED_VARIABLE_DECLARATION_FRAGMENT = 119;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9595,6 +10799,15 @@
> 	int UNRESOLVED_VARIABLE_DECLARATION_FRAGMENT__ORIGINAL_COMPILATION_UNIT = VARIABLE_DECLARATION_FRAGMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int UNRESOLVED_VARIABLE_DECLARATION_FRAGMENT__ORIGINAL_CLASS_FILE = VARIABLE_DECLARATION_FRAGMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -9649,15 +10862,6 @@
> 	int UNRESOLVED_VARIABLE_DECLARATION_FRAGMENT__USAGE_IN_VARIABLE_ACCESS = VARIABLE_DECLARATION_FRAGMENT__USAGE_IN_VARIABLE_ACCESS;
> 
> 	/**
>-	 * The feature id for the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * @generated
>-	 * @ordered
>-	 */
>-	int UNRESOLVED_VARIABLE_DECLARATION_FRAGMENT__QUALIFIED_NAME = VARIABLE_DECLARATION_FRAGMENT__QUALIFIED_NAME;
>-
>-	/**
> 	 * The feature id for the 'Variables Container' container reference.
> 	 * 
> 	 * 
>@@ -9683,7 +10887,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getVariableDeclarationExpression()
> 	 * @generated
> 	 */
>-	int VARIABLE_DECLARATION_EXPRESSION = 115;
>+	int VARIABLE_DECLARATION_EXPRESSION = 121;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9704,6 +10908,15 @@
> 	int VARIABLE_DECLARATION_EXPRESSION__ORIGINAL_COMPILATION_UNIT = EXPRESSION__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int VARIABLE_DECLARATION_EXPRESSION__ORIGINAL_CLASS_FILE = EXPRESSION__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Type' containment reference.
> 	 * 
> 	 * 
>@@ -9756,7 +10969,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getVariableDeclarationStatement()
> 	 * @generated
> 	 */
>-	int VARIABLE_DECLARATION_STATEMENT = 117;
>+	int VARIABLE_DECLARATION_STATEMENT = 123;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9777,6 +10990,15 @@
> 	int VARIABLE_DECLARATION_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int VARIABLE_DECLARATION_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Type' containment reference.
> 	 * 
> 	 * 
>@@ -9838,7 +11060,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getWildCardType()
> 	 * @generated
> 	 */
>-	int WILD_CARD_TYPE = 118;
>+	int WILD_CARD_TYPE = 124;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9859,6 +11081,15 @@
> 	int WILD_CARD_TYPE__ORIGINAL_COMPILATION_UNIT = TYPE__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WILD_CARD_TYPE__ORIGINAL_CLASS_FILE = TYPE__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Name' attribute.
> 	 * 
> 	 * 
>@@ -9929,7 +11160,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getWhileStatement()
> 	 * @generated
> 	 */
>-	int WHILE_STATEMENT = 119;
>+	int WHILE_STATEMENT = 125;
> 
> 	/**
> 	 * The feature id for the 'Comments' containment reference list.
>@@ -9950,6 +11181,15 @@
> 	int WHILE_STATEMENT__ORIGINAL_COMPILATION_UNIT = STATEMENT__ORIGINAL_COMPILATION_UNIT;
> 
> 	/**
>+	 * The feature id for the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * @generated
>+	 * @ordered
>+	 */
>+	int WHILE_STATEMENT__ORIGINAL_CLASS_FILE = STATEMENT__ORIGINAL_CLASS_FILE;
>+
>+	/**
> 	 * The feature id for the 'Expression' containment reference.
> 	 * 
> 	 * 
>@@ -9984,7 +11224,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getAssignmentKind()
> 	 * @generated
> 	 */
>-	int ASSIGNMENT_KIND = 120;
>+	int ASSIGNMENT_KIND = 126;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.InfixExpressionKind Infix Expression Kind}' enum.
>@@ -9994,7 +11234,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getInfixExpressionKind()
> 	 * @generated
> 	 */
>-	int INFIX_EXPRESSION_KIND = 121;
>+	int INFIX_EXPRESSION_KIND = 127;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.InheritanceKind Inheritance Kind}' enum.
>@@ -10004,7 +11244,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getInheritanceKind()
> 	 * @generated
> 	 */
>-	int INHERITANCE_KIND = 122;
>+	int INHERITANCE_KIND = 128;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.PostfixExpressionKind Postfix Expression Kind}' enum.
>@@ -10014,7 +11254,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPostfixExpressionKind()
> 	 * @generated
> 	 */
>-	int POSTFIX_EXPRESSION_KIND = 123;
>+	int POSTFIX_EXPRESSION_KIND = 129;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.PrefixExpressionKind Prefix Expression Kind}' enum.
>@@ -10024,7 +11264,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getPrefixExpressionKind()
> 	 * @generated
> 	 */
>-	int PREFIX_EXPRESSION_KIND = 124;
>+	int PREFIX_EXPRESSION_KIND = 130;
> 
> 	/**
> 	 * The meta object id for the '{@link org.eclipse.gmt.modisco.java.VisibilityKind Visibility Kind}' enum.
>@@ -10034,7 +11274,7 @@
> 	 * @see org.eclipse.gmt.modisco.java.emf.impl.JavaPackageImpl#getVisibilityKind()
> 	 * @generated
> 	 */
>-	int VISIBILITY_KIND = 125;
>+	int VISIBILITY_KIND = 131;
> 
> 
> 	/**
>@@ -10048,28 +11288,6 @@
> 	EClass getAbstractMethodDeclaration();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#isVarargs Varargs}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Varargs'.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#isVarargs()
>-	 * @see #getAbstractMethodDeclaration()
>-	 * @generated
>-	 */
>-	EAttribute getAbstractMethodDeclaration_Varargs();
>-
>-	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getQualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Qualified Name'.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getQualifiedName()
>-	 * @see #getAbstractMethodDeclaration()
>-	 * @generated
>-	 */
>-	EAttribute getAbstractMethodDeclaration_QualifiedName();
>-
>-	/**
> 	 * Returns the meta object for the containment reference '{@link org.eclipse.gmt.modisco.java.AbstractMethodDeclaration#getBody Body}'.
> 	 * 
> 	 * 
>@@ -10189,17 +11407,6 @@
> 	EClass getAbstractTypeDeclaration();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getQualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Qualified Name'.
>-	 * @see org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getQualifiedName()
>-	 * @see #getAbstractTypeDeclaration()
>-	 * @generated
>-	 */
>-	EAttribute getAbstractTypeDeclaration_QualifiedName();
>-
>-	/**
> 	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getBodyDeclarations Body Declarations}'.
> 	 * 
> 	 * 
>@@ -10340,6 +11547,49 @@
> 	EReference getAnnotation_Values();
> 
> 	/**
>+	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.Archive Archive}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Archive'.
>+	 * @see org.eclipse.gmt.modisco.java.Archive
>+	 * @generated
>+	 */
>+	EClass getArchive();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.Archive#getOriginalFilePath Original File Path}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Original File Path'.
>+	 * @see org.eclipse.gmt.modisco.java.Archive#getOriginalFilePath()
>+	 * @see #getArchive()
>+	 * @generated
>+	 */
>+	EAttribute getArchive_OriginalFilePath();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.Archive#getClassFiles Class Files}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Class Files'.
>+	 * @see org.eclipse.gmt.modisco.java.Archive#getClassFiles()
>+	 * @see #getArchive()
>+	 * @generated
>+	 */
>+	EReference getArchive_ClassFiles();
>+
>+	/**
>+	 * Returns the meta object for the containment reference '{@link org.eclipse.gmt.modisco.java.Archive#getManifest Manifest}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference 'Manifest'.
>+	 * @see org.eclipse.gmt.modisco.java.Archive#getManifest()
>+	 * @see #getArchive()
>+	 * @generated
>+	 */
>+	EReference getArchive_Manifest();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.AssertStatement Assert Statement}'.
> 	 * 
> 	 * 
>@@ -10404,6 +11654,17 @@
> 	EReference getASTNode_OriginalCompilationUnit();
> 
> 	/**
>+	 * Returns the meta object for the reference '{@link org.eclipse.gmt.modisco.java.ASTNode#getOriginalClassFile Original Class File}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the reference 'Original Class File'.
>+	 * @see org.eclipse.gmt.modisco.java.ASTNode#getOriginalClassFile()
>+	 * @see #getASTNode()
>+	 * @generated
>+	 */
>+	EReference getASTNode_OriginalClassFile();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.AnnotationMemberValuePair Annotation Member Value Pair}'.
> 	 * 
> 	 * 
>@@ -10648,17 +11909,6 @@
> 	EClass getArrayType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ArrayType#getQualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Qualified Name'.
>-	 * @see org.eclipse.gmt.modisco.java.ArrayType#getQualifiedName()
>-	 * @see #getArrayType()
>-	 * @generated
>-	 */
>-	EAttribute getArrayType_QualifiedName();
>-
>-	/**
> 	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ArrayType#getDimensions Dimensions}'.
> 	 * 
> 	 * 
>@@ -10936,6 +12186,60 @@
> 	EAttribute getCharacterLiteral_EscapedValue();
> 
> 	/**
>+	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.ClassFile Class File}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Class File'.
>+	 * @see org.eclipse.gmt.modisco.java.ClassFile
>+	 * @generated
>+	 */
>+	EClass getClassFile();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ClassFile#getOriginalFilePath Original File Path}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Original File Path'.
>+	 * @see org.eclipse.gmt.modisco.java.ClassFile#getOriginalFilePath()
>+	 * @see #getClassFile()
>+	 * @generated
>+	 */
>+	EAttribute getClassFile_OriginalFilePath();
>+
>+	/**
>+	 * Returns the meta object for the reference '{@link org.eclipse.gmt.modisco.java.ClassFile#getType Type}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the reference 'Type'.
>+	 * @see org.eclipse.gmt.modisco.java.ClassFile#getType()
>+	 * @see #getClassFile()
>+	 * @generated
>+	 */
>+	EReference getClassFile_Type();
>+
>+	/**
>+	 * Returns the meta object for the reference '{@link org.eclipse.gmt.modisco.java.ClassFile#getAttachedSource Attached Source}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the reference 'Attached Source'.
>+	 * @see org.eclipse.gmt.modisco.java.ClassFile#getAttachedSource()
>+	 * @see #getClassFile()
>+	 * @generated
>+	 */
>+	EReference getClassFile_AttachedSource();
>+
>+	/**
>+	 * Returns the meta object for the reference '{@link org.eclipse.gmt.modisco.java.ClassFile#getPackage Package}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the reference 'Package'.
>+	 * @see org.eclipse.gmt.modisco.java.ClassFile#getPackage()
>+	 * @see #getClassFile()
>+	 * @generated
>+	 */
>+	EReference getClassFile_Package();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.ClassInstanceCreation Class Instance Creation}'.
> 	 * 
> 	 * 
>@@ -11723,6 +13027,102 @@
> 	EClass getLineComment();
> 
> 	/**
>+	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.Manifest Manifest}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Manifest'.
>+	 * @see org.eclipse.gmt.modisco.java.Manifest
>+	 * @generated
>+	 */
>+	EClass getManifest();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.Manifest#getMainAttributes Main Attributes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Main Attributes'.
>+	 * @see org.eclipse.gmt.modisco.java.Manifest#getMainAttributes()
>+	 * @see #getManifest()
>+	 * @generated
>+	 */
>+	EReference getManifest_MainAttributes();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.Manifest#getEntryAttributes Entry Attributes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Entry Attributes'.
>+	 * @see org.eclipse.gmt.modisco.java.Manifest#getEntryAttributes()
>+	 * @see #getManifest()
>+	 * @generated
>+	 */
>+	EReference getManifest_EntryAttributes();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.ManifestAttribute Manifest Attribute}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Manifest Attribute'.
>+	 * @see org.eclipse.gmt.modisco.java.ManifestAttribute
>+	 * @generated
>+	 */
>+	EClass getManifestAttribute();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ManifestAttribute#getKey Key}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Key'.
>+	 * @see org.eclipse.gmt.modisco.java.ManifestAttribute#getKey()
>+	 * @see #getManifestAttribute()
>+	 * @generated
>+	 */
>+	EAttribute getManifestAttribute_Key();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ManifestAttribute#getValue Value}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Value'.
>+	 * @see org.eclipse.gmt.modisco.java.ManifestAttribute#getValue()
>+	 * @see #getManifestAttribute()
>+	 * @generated
>+	 */
>+	EAttribute getManifestAttribute_Value();
>+
>+	/**
>+	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.ManifestEntry Manifest Entry}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Manifest Entry'.
>+	 * @see org.eclipse.gmt.modisco.java.ManifestEntry
>+	 * @generated
>+	 */
>+	EClass getManifestEntry();
>+
>+	/**
>+	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ManifestEntry#getName Name}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the attribute 'Name'.
>+	 * @see org.eclipse.gmt.modisco.java.ManifestEntry#getName()
>+	 * @see #getManifestEntry()
>+	 * @generated
>+	 */
>+	EAttribute getManifestEntry_Name();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.ManifestEntry#getAttributes Attributes}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Attributes'.
>+	 * @see org.eclipse.gmt.modisco.java.ManifestEntry#getAttributes()
>+	 * @see #getManifestEntry()
>+	 * @generated
>+	 */
>+	EReference getManifestEntry_Attributes();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.MemberRef Member Ref}'.
> 	 * 
> 	 * 
>@@ -11981,6 +13381,28 @@
> 	EReference getModel_CompilationUnits();
> 
> 	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.Model#getClassFiles Class Files}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Class Files'.
>+	 * @see org.eclipse.gmt.modisco.java.Model#getClassFiles()
>+	 * @see #getModel()
>+	 * @generated
>+	 */
>+	EReference getModel_ClassFiles();
>+
>+	/**
>+	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.Model#getArchives Archives}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for the containment reference list 'Archives'.
>+	 * @see org.eclipse.gmt.modisco.java.Model#getArchives()
>+	 * @see #getModel()
>+	 * @generated
>+	 */
>+	EReference getModel_Archives();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.Modifier Modifier}'.
> 	 * 
> 	 * 
>@@ -12166,6 +13588,16 @@
> 	EReference getNamedElement_UsagesInImports();
> 
> 	/**
>+	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.NamespaceAccess Namespace Access}'.
>+	 * 
>+	 * 
>+	 * @return the meta object for class 'Namespace Access'.
>+	 * @see org.eclipse.gmt.modisco.java.NamespaceAccess
>+	 * @generated
>+	 */
>+	EClass getNamespaceAccess();
>+
>+	/**
> 	 * Returns the meta object for class '{@link org.eclipse.gmt.modisco.java.NumberLiteral Number Literal}'.
> 	 * 
> 	 * 
>@@ -12207,17 +13639,6 @@
> 	EClass getPackage();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.Package#getQualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Qualified Name'.
>-	 * @see org.eclipse.gmt.modisco.java.Package#getQualifiedName()
>-	 * @see #getPackage()
>-	 * @generated
>-	 */
>-	EAttribute getPackage_QualifiedName();
>-
>-	/**
> 	 * Returns the meta object for the containment reference list '{@link org.eclipse.gmt.modisco.java.Package#getOwnedElements Owned Elements}'.
> 	 * 
> 	 * 
>@@ -12315,17 +13736,6 @@
> 	EClass getParameterizedType();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.ParameterizedType#getQualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Qualified Name'.
>-	 * @see org.eclipse.gmt.modisco.java.ParameterizedType#getQualifiedName()
>-	 * @see #getParameterizedType()
>-	 * @generated
>-	 */
>-	EAttribute getParameterizedType_QualifiedName();
>-
>-	/**
> 	 * Returns the meta object for the containment reference '{@link org.eclipse.gmt.modisco.java.ParameterizedType#getType Type}'.
> 	 * 
> 	 * 
>@@ -13353,17 +14763,6 @@
> 	EClass getVariableDeclarationFragment();
> 
> 	/**
>-	 * Returns the meta object for the attribute '{@link org.eclipse.gmt.modisco.java.VariableDeclarationFragment#getQualifiedName Qualified Name}'.
>-	 * 
>-	 * 
>-	 * @return the meta object for the attribute 'Qualified Name'.
>-	 * @see org.eclipse.gmt.modisco.java.VariableDeclarationFragment#getQualifiedName()
>-	 * @see #getVariableDeclarationFragment()
>-	 * @generated
>-	 */
>-	EAttribute getVariableDeclarationFragment_QualifiedName();
>-
>-	/**
> 	 * Returns the meta object for the container reference '{@link org.eclipse.gmt.modisco.java.VariableDeclarationFragment#getVariablesContainer Variables Container}'.
> 	 * 
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/emf/JavaFactory.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/emf/JavaFactory.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/emf/JavaFactory.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -26,6 +27,7 @@
> import org.eclipse.gmt.modisco.java.AnnotationTypeDeclaration;
> import org.eclipse.gmt.modisco.java.AnnotationTypeMemberDeclaration;
> import org.eclipse.gmt.modisco.java.AnonymousClassDeclaration;
>+import org.eclipse.gmt.modisco.java.Archive;
> import org.eclipse.gmt.modisco.java.ArrayAccess;
> import org.eclipse.gmt.modisco.java.ArrayCreation;
> import org.eclipse.gmt.modisco.java.ArrayInitializer;
>@@ -41,6 +43,7 @@
> import org.eclipse.gmt.modisco.java.CatchClause;
> import org.eclipse.gmt.modisco.java.CharacterLiteral;
> import org.eclipse.gmt.modisco.java.ClassDeclaration;
>+import org.eclipse.gmt.modisco.java.ClassFile;
> import org.eclipse.gmt.modisco.java.ClassInstanceCreation;
> import org.eclipse.gmt.modisco.java.CompilationUnit;
> import org.eclipse.gmt.modisco.java.ConditionalExpression;
>@@ -65,6 +68,9 @@
> import org.eclipse.gmt.modisco.java.Javadoc;
> import org.eclipse.gmt.modisco.java.LabeledStatement;
> import org.eclipse.gmt.modisco.java.LineComment;
>+import org.eclipse.gmt.modisco.java.Manifest;
>+import org.eclipse.gmt.modisco.java.ManifestAttribute;
>+import org.eclipse.gmt.modisco.java.ManifestEntry;
> import org.eclipse.gmt.modisco.java.MemberRef;
> import org.eclipse.gmt.modisco.java.MethodDeclaration;
> import org.eclipse.gmt.modisco.java.MethodInvocation;
>@@ -154,6 +160,15 @@
> 	Annotation createAnnotation();
> 
> 	/**
>+	 * Returns a new object of class 'Archive'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Archive'.
>+	 * @generated
>+	 */
>+	Archive createArchive();
>+
>+	/**
> 	 * Returns a new object of class 'Assert Statement'.
> 	 * 
> 	 * 
>@@ -316,6 +331,15 @@
> 	CharacterLiteral createCharacterLiteral();
> 
> 	/**
>+	 * Returns a new object of class 'Class File'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Class File'.
>+	 * @generated
>+	 */
>+	ClassFile createClassFile();
>+
>+	/**
> 	 * Returns a new object of class 'Class Instance Creation'.
> 	 * 
> 	 * 
>@@ -541,6 +565,33 @@
> 	LineComment createLineComment();
> 
> 	/**
>+	 * Returns a new object of class 'Manifest'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Manifest'.
>+	 * @generated
>+	 */
>+	Manifest createManifest();
>+
>+	/**
>+	 * Returns a new object of class 'Manifest Attribute'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Manifest Attribute'.
>+	 * @generated
>+	 */
>+	ManifestAttribute createManifestAttribute();
>+
>+	/**
>+	 * Returns a new object of class 'Manifest Entry'.
>+	 * 
>+	 * 
>+	 * @return a new object of class 'Manifest Entry'.
>+	 * @generated
>+	 */
>+	ManifestEntry createManifestEntry();
>+
>+	/**
> 	 * Returns a new object of class 'Member Ref'.
> 	 * 
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/WhileStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/WhileStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/WhileStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/VariableDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/VariableDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/VariableDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/MethodRef.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/MethodRef.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/MethodRef.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/NamedElement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/NamedElement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/NamedElement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ParameterizedType.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ParameterizedType.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ParameterizedType.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -29,7 +30,6 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.ParameterizedType#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.ParameterizedType#getType Type}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.ParameterizedType#getTypeArguments Type Arguments}</li>
> * </ul>
>@@ -41,21 +41,6 @@
> */
> public interface ParameterizedType extends Type {
> 	/**
>-	 * Returns the value of the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Qualified Name' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Qualified Name' attribute.
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getParameterizedType_QualifiedName()
>-	 * @model unique="false" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
>-	 * @generated
>-	 */
>-	String getQualifiedName();
>-
>-	/**
> 	 * Returns the value of the 'Type' containment reference.
> 	 * 
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/MethodInvocation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/MethodInvocation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/MethodInvocation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Package.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Package.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Package.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -29,7 +30,6 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.Package#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.Package#getOwnedElements Owned Elements}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.Package#getModel Model}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.Package#getOwnedPackages Owned Packages}</li>
>@@ -44,21 +44,6 @@
> */
> public interface Package extends NamedElement {
> 	/**
>-	 * Returns the value of the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Qualified Name' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Qualified Name' attribute.
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getPackage_QualifiedName()
>-	 * @model unique="false" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
>-	 * @generated
>-	 */
>-	String getQualifiedName();
>-
>-	/**
> 	 * Returns the value of the 'Owned Elements' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration}.
> 	 * It is bidirectional and its opposite is '{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getPackage Package}'.
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/CompilationUnit.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/CompilationUnit.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/CompilationUnit.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Archive.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Archive.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/Archive.java	(revision 0)
>@@ -0,0 +1,112 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Archive'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Archive#getOriginalFilePath Original File Path}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Archive#getClassFiles Class Files}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Archive#getManifest Manifest}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getArchive()
>+ * @model
>+ * @generated
>+ */
>+public interface Archive extends NamedElement {
>+	/**
>+	 * Returns the value of the 'Original File Path' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Original File Path' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Original File Path' attribute.
>+	 * @see #setOriginalFilePath(String)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getArchive_OriginalFilePath()
>+	 * @model unique="false" required="true" ordered="false"
>+	 * @generated
>+	 */
>+	String getOriginalFilePath();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.Archive#getOriginalFilePath Original File Path}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Original File Path' attribute.
>+	 * @see #getOriginalFilePath()
>+	 * @generated
>+	 */
>+	void setOriginalFilePath(String value);
>+
>+	/**
>+	 * Returns the value of the 'Class Files' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.ClassFile}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Class Files' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Class Files' containment reference list.
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getArchive_ClassFiles()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	EList<ClassFile> getClassFiles();
>+
>+	/**
>+	 * Returns the value of the 'Manifest' containment reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Manifest' containment reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Manifest' containment reference.
>+	 * @see #setManifest(Manifest)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getArchive_Manifest()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	Manifest getManifest();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.Archive#getManifest Manifest}' containment reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Manifest' containment reference.
>+	 * @see #getManifest()
>+	 * @generated
>+	 */
>+	void setManifest(Manifest value);
>+
>+} // Archive
>Index: src/org/eclipse/gmt/modisco/java/LineComment.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/LineComment.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/LineComment.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -28,7 +29,6 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.VariableDeclarationFragment#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.VariableDeclarationFragment#getVariablesContainer Variables Container}</li>
> * </ul>
> * 
>@@ -39,21 +39,6 @@
> */
> public interface VariableDeclarationFragment extends VariableDeclaration {
> 	/**
>-	 * Returns the value of the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Qualified Name' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Qualified Name' attribute.
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getVariableDeclarationFragment_QualifiedName()
>-	 * @model unique="false" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
>-	 * @generated
>-	 */
>-	String getQualifiedName();
>-
>-	/**
> 	 * Returns the value of the 'Variables Container' container reference.
> 	 * It is bidirectional and its opposite is '{@link org.eclipse.gmt.modisco.java.AbstractVariablesContainer#getFragments Fragments}'.
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/Comment.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Comment.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Comment.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/CatchClause.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/CatchClause.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/CatchClause.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ExpressionStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ExpressionStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ExpressionStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/TypeParameter.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TypeParameter.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TypeParameter.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ManifestAttribute.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ManifestAttribute.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/ManifestAttribute.java	(revision 0)
>@@ -0,0 +1,95 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java;
>+
>+import org.eclipse.emf.ecore.EObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Manifest Attribute'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ManifestAttribute#getKey Key}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ManifestAttribute#getValue Value}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifestAttribute()
>+ * @model
>+ * @generated
>+ */
>+public interface ManifestAttribute extends EObject {
>+	/**
>+	 * Returns the value of the 'Key' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Key' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Key' attribute.
>+	 * @see #setKey(String)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifestAttribute_Key()
>+	 * @model unique="false" required="true" ordered="false"
>+	 * @generated
>+	 */
>+	String getKey();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ManifestAttribute#getKey Key}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Key' attribute.
>+	 * @see #getKey()
>+	 * @generated
>+	 */
>+	void setKey(String value);
>+
>+	/**
>+	 * Returns the value of the 'Value' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Value' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Value' attribute.
>+	 * @see #setValue(String)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifestAttribute_Value()
>+	 * @model unique="false" required="true" ordered="false"
>+	 * @generated
>+	 */
>+	String getValue();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ManifestAttribute#getValue Value}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Value' attribute.
>+	 * @see #getValue()
>+	 * @generated
>+	 */
>+	void setValue(String value);
>+
>+} // ManifestAttribute
>Index: src/org/eclipse/gmt/modisco/java/Assignment.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Assignment.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Assignment.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/InstanceofExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/InstanceofExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/InstanceofExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/EnumDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/EnumDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/EnumDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/WildCardType.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/WildCardType.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/WildCardType.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java	(working copy)
>@@ -24,7 +24,7 @@
> 
> public class JavaPlugin extends Plugin {
> 	
>-	public static final String PLUGIN_ID = "org.eclipse.gmt.modisco.java";
>+	public static final String PLUGIN_ID = "org.eclipse.gmt.modisco.java"; //$NON-NLS-1$
> 
> 	// The shared instance
> 	private static JavaPlugin plugin;
>Index: src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	INCREMENT(1, "INCREMENT", "++"),
>+	INCREMENT(1, "INCREMENT", "++"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'DECREMENT' literal object.
>@@ -53,7 +54,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	DECREMENT(2, "DECREMENT", "--"),
>+	DECREMENT(2, "DECREMENT", "--"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'PLUS' literal object.
>@@ -63,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	PLUS(3, "PLUS", "+"),
>+	PLUS(3, "PLUS", "+"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'MINUS' literal object.
>@@ -73,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	MINUS(4, "MINUS", "-"),
>+	MINUS(4, "MINUS", "-"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'COMPLEMENT' literal object.
>@@ -83,7 +84,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	COMPLEMENT(5, "COMPLEMENT", "~"),
>+	COMPLEMENT(5, "COMPLEMENT", "~"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'NOT' literal object.
>@@ -93,7 +94,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	NOT(6, "NOT", "!");
>+	NOT(6, "NOT", "!"); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'INCREMENT' literal value.
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/IfStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/IfStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/IfStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/NamespaceAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/NamespaceAccess.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/NamespaceAccess.java	(revision 0)
>@@ -0,0 +1,35 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java;
>+
>+
>+/**
>+ * 
>+ * A representation of the model object 'Namespace Access'.
>+ * 
>+ *
>+ *
>+ * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getNamespaceAccess()
>+ * @model abstract="true"
>+ * @generated
>+ */
>+public interface NamespaceAccess extends ASTNode {
>+} // NamespaceAccess
>Index: src/org/eclipse/gmt/modisco/java/InfixExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/InfixExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/InfixExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveType.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveType.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveType.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Model.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Model.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Model.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -36,6 +37,8 @@
> * <li>{@link org.eclipse.gmt.modisco.java.Model#getOrphanTypes Orphan Types}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.Model#getUnresolvedItems Unresolved Items}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.Model#getCompilationUnits Compilation Units}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Model#getClassFiles Class Files}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Model#getArchives Archives}</li>
> * </ul>
> * 
> *
>@@ -136,4 +139,36 @@
> 	 */
> 	EList<CompilationUnit> getCompilationUnits();
> 
>+	/**
>+	 * Returns the value of the 'Class Files' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.ClassFile}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Class Files' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Class Files' containment reference list.
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getModel_ClassFiles()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	EList<ClassFile> getClassFiles();
>+
>+	/**
>+	 * Returns the value of the 'Archives' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.Archive}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Archives' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Archives' containment reference list.
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getModel_Archives()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	EList<Archive> getArchives();
>+
> } // Model
>Index: src/org/eclipse/gmt/modisco/java/CastExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/CastExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/CastExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/FieldAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/FieldAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/FieldAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SwitchCase.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SwitchCase.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SwitchCase.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Initializer.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Initializer.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Initializer.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ArrayCreation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ArrayCreation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ArrayCreation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/MethodRefParameter.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/MethodRefParameter.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/MethodRefParameter.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Javadoc.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Javadoc.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Javadoc.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	TIMES(1, "TIMES", "*"),
>+	TIMES(1, "TIMES", "*"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'DIVIDE' literal object.
>@@ -53,7 +54,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	DIVIDE(2, "DIVIDE", "/"),
>+	DIVIDE(2, "DIVIDE", "/"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'REMAINDER' literal object.
>@@ -63,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	REMAINDER(3, "REMAINDER", "%"),
>+	REMAINDER(3, "REMAINDER", "%"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'PLUS' literal object.
>@@ -73,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	PLUS(4, "PLUS", "+"),
>+	PLUS(4, "PLUS", "+"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'MINUS' literal object.
>@@ -83,7 +84,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	MINUS(5, "MINUS", "-"),
>+	MINUS(5, "MINUS", "-"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'LEFT SHIFT' literal object.
>@@ -93,7 +94,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	LEFT_SHIFT(6, "LEFT_SHIFT", "<<"),
>+	LEFT_SHIFT(6, "LEFT_SHIFT", "<<"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'RIGHT SHIFT SIGNED' literal object.
>@@ -103,7 +104,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	RIGHT_SHIFT_SIGNED(7, "RIGHT_SHIFT_SIGNED", ">>"),
>+	RIGHT_SHIFT_SIGNED(7, "RIGHT_SHIFT_SIGNED", ">>"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'RIGHT SHIFT UNSIGNED' literal object.
>@@ -113,7 +114,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	RIGHT_SHIFT_UNSIGNED(8, "RIGHT_SHIFT_UNSIGNED", ">>>"),
>+	RIGHT_SHIFT_UNSIGNED(8, "RIGHT_SHIFT_UNSIGNED", ">>>"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'LESS' literal object.
>@@ -123,7 +124,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	LESS(9, "LESS", "<"),
>+	LESS(9, "LESS", "<"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'GREATER' literal object.
>@@ -133,7 +134,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	GREATER(10, "GREATER", ">"),
>+	GREATER(10, "GREATER", ">"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'LESS EQUALS' literal object.
>@@ -143,7 +144,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	LESS_EQUALS(11, "LESS_EQUALS", "<="),
>+	LESS_EQUALS(11, "LESS_EQUALS", "<="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'GREATER EQUALS' literal object.
>@@ -153,7 +154,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	GREATER_EQUALS(12, "GREATER_EQUALS", ">="),
>+	GREATER_EQUALS(12, "GREATER_EQUALS", ">="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'EQUALS' literal object.
>@@ -163,7 +164,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	EQUALS(13, "EQUALS", "=="),
>+	EQUALS(13, "EQUALS", "=="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'NOT EQUALS' literal object.
>@@ -173,7 +174,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	NOT_EQUALS(14, "NOT_EQUALS", "!="),
>+	NOT_EQUALS(14, "NOT_EQUALS", "!="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'XOR' literal object.
>@@ -183,7 +184,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	XOR(15, "XOR", "^"),
>+	XOR(15, "XOR", "^"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'AND' literal object.
>@@ -193,7 +194,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	AND(16, "AND", "&"),
>+	AND(16, "AND", "&"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'OR' literal object.
>@@ -203,7 +204,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	OR(17, "OR", "|"),
>+	OR(17, "OR", "|"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'CONDITIONAL AND' literal object.
>@@ -213,7 +214,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	CONDITIONAL_AND(18, "CONDITIONAL_AND", "&&"),
>+	CONDITIONAL_AND(18, "CONDITIONAL_AND", "&&"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'CONDITIONAL OR' literal object.
>@@ -223,7 +224,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	CONDITIONAL_OR(19, "CONDITIONAL_OR", "||");
>+	CONDITIONAL_OR(19, "CONDITIONAL_OR", "||"); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'TIMES' literal value.
>Index: src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Annotation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Annotation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Annotation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SwitchStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SwitchStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SwitchStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AssignmentKind.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AssignmentKind.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AssignmentKind.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	ASSIGN(1, "ASSIGN", "+="),
>+	ASSIGN(1, "ASSIGN", "="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'PLUS ASSIGN' literal object.
>@@ -53,7 +54,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	PLUS_ASSIGN(2, "PLUS_ASSIGN", "PLUS_ASSIGN"),
>+	PLUS_ASSIGN(2, "PLUS_ASSIGN", "+="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'MINUS ASSIGN' literal object.
>@@ -63,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	MINUS_ASSIGN(3, "MINUS_ASSIGN", "-="),
>+	MINUS_ASSIGN(3, "MINUS_ASSIGN", "-="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'TIMES ASSIGN' literal object.
>@@ -73,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	TIMES_ASSIGN(4, "TIMES_ASSIGN", "*="),
>+	TIMES_ASSIGN(4, "TIMES_ASSIGN", "*="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'DIVIDE ASSIGN' literal object.
>@@ -83,7 +84,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	DIVIDE_ASSIGN(5, "DIVIDE_ASSIGN", "/="),
>+	DIVIDE_ASSIGN(5, "DIVIDE_ASSIGN", "/="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'BIT AND ASSIGN' literal object.
>@@ -93,7 +94,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	BIT_AND_ASSIGN(6, "BIT_AND_ASSIGN", "&="),
>+	BIT_AND_ASSIGN(6, "BIT_AND_ASSIGN", "&="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'BIT OR ASSIGN' literal object.
>@@ -103,7 +104,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	BIT_OR_ASSIGN(7, "BIT_OR_ASSIGN", "|="),
>+	BIT_OR_ASSIGN(7, "BIT_OR_ASSIGN", "|="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'BIT XOR ASSIGN' literal object.
>@@ -113,7 +114,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	BIT_XOR_ASSIGN(8, "BIT_XOR_ASSIGN", "^="),
>+	BIT_XOR_ASSIGN(8, "BIT_XOR_ASSIGN", "^="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'REMAINDER ASSIGN' literal object.
>@@ -123,7 +124,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	REMAINDER_ASSIGN(9, "REMAINDER_ASSIGN", "%="),
>+	REMAINDER_ASSIGN(9, "REMAINDER_ASSIGN", "%="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'LEFT SHIFT ASSIGN' literal object.
>@@ -133,7 +134,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	LEFT_SHIFT_ASSIGN(10, "LEFT_SHIFT_ASSIGN", "<<="),
>+	LEFT_SHIFT_ASSIGN(10, "LEFT_SHIFT_ASSIGN", "<<="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'RIGHT SHIFT SIGNED ASSIGN' literal object.
>@@ -143,7 +144,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	RIGHT_SHIFT_SIGNED_ASSIGN(11, "RIGHT_SHIFT_SIGNED_ASSIGN", ">>="),
>+	RIGHT_SHIFT_SIGNED_ASSIGN(11, "RIGHT_SHIFT_SIGNED_ASSIGN", ">>="), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'RIGHT SHIFT UNSIGNED ASSIGN' literal object.
>@@ -153,7 +154,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	RIGHT_SHIFT_UNSIGNED_ASSIGN(12, "RIGHT_SHIFT_UNSIGNED_ASSIGN", ">>>=");
>+	RIGHT_SHIFT_UNSIGNED_ASSIGN(12, "RIGHT_SHIFT_UNSIGNED_ASSIGN", ">>>="); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'ASSIGN' literal value.
>@@ -164,7 +165,7 @@
> 	 * 
> 	 * 
> 	 * @see #ASSIGN
>-	 * @model literal="+="
>+	 * @model literal="="
> 	 * @generated
> 	 * @ordered
> 	 */
>@@ -179,7 +180,7 @@
> 	 * 
> 	 * 
> 	 * @see #PLUS_ASSIGN
>-	 * @model
>+	 * @model literal="+="
> 	 * @generated
> 	 * @ordered
> 	 */
>Index: src/org/eclipse/gmt/modisco/java/TryStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TryStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TryStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ASTNode.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ASTNode.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ASTNode.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -33,6 +34,7 @@
> * <ul>
> * <li>{@link org.eclipse.gmt.modisco.java.ASTNode#getComments Comments}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.ASTNode#getOriginalCompilationUnit Original Compilation Unit}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ASTNode#getOriginalClassFile Original Class File}</li>
> * </ul>
> * 
> *
>@@ -83,4 +85,30 @@
> 	 */
> 	void setOriginalCompilationUnit(CompilationUnit value);
> 
>+	/**
>+	 * Returns the value of the 'Original Class File' reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Original Class File' reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Original Class File' reference.
>+	 * @see #setOriginalClassFile(ClassFile)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getASTNode_OriginalClassFile()
>+	 * @model ordered="false"
>+	 * @generated
>+	 */
>+	ClassFile getOriginalClassFile();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ASTNode#getOriginalClassFile Original Class File}' reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Original Class File' reference.
>+	 * @see #getOriginalClassFile()
>+	 * @generated
>+	 */
>+	void setOriginalClassFile(ClassFile value);
>+
> } // ASTNode
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/TagElement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TagElement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TagElement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Modifier.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Modifier.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Modifier.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/BreakStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/BreakStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/BreakStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/NumberLiteral.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/NumberLiteral.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/NumberLiteral.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ArrayAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ArrayAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ArrayAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ArrayInitializer.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ArrayInitializer.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ArrayInitializer.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ForStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ForStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ForStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PackageAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PackageAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PackageAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -37,7 +38,7 @@
> * @model
> * @generated
> */
>-public interface PackageAccess extends Expression {
>+public interface PackageAccess extends NamespaceAccess {
> 	/**
> 	 * Returns the value of the 'Package' reference.
> 	 * It is bidirectional and its opposite is '{@link org.eclipse.gmt.modisco.java.Package#getUsagesInPackageAccess Usages In Package Access}'.
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ManifestEntry.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ManifestEntry.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/ManifestEntry.java	(revision 0)
>@@ -0,0 +1,87 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Manifest Entry'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ManifestEntry#getName Name}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ManifestEntry#getAttributes Attributes}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifestEntry()
>+ * @model
>+ * @generated
>+ */
>+public interface ManifestEntry extends EObject {
>+	/**
>+	 * Returns the value of the 'Name' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Name' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Name' attribute.
>+	 * @see #setName(String)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifestEntry_Name()
>+	 * @model unique="false" required="true" ordered="false"
>+	 * @generated
>+	 */
>+	String getName();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ManifestEntry#getName Name}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Name' attribute.
>+	 * @see #getName()
>+	 * @generated
>+	 */
>+	void setName(String value);
>+
>+	/**
>+	 * Returns the value of the 'Attributes' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.ManifestAttribute}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Attributes' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Attributes' containment reference list.
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifestEntry_Attributes()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	EList<ManifestAttribute> getAttributes();
>+
>+} // ManifestEntry
>Index: src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ArrayType.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ArrayType.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ArrayType.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -28,7 +29,6 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.ArrayType#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.ArrayType#getDimensions Dimensions}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.ArrayType#getElementType Element Type}</li>
> * </ul>
>@@ -40,21 +40,6 @@
> */
> public interface ArrayType extends Type {
> 	/**
>-	 * Returns the value of the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Qualified Name' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Qualified Name' attribute.
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getArrayType_QualifiedName()
>-	 * @model unique="false" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
>-	 * @generated
>-	 */
>-	String getQualifiedName();
>-
>-	/**
> 	 * Returns the value of the 'Dimensions' attribute.
> 	 * 
> 	 * 
>Index: src/org/eclipse/gmt/modisco/java/CharacterLiteral.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/CharacterLiteral.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/CharacterLiteral.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	INCREMENT(1, "INCREMENT", "++"),
>+	INCREMENT(1, "INCREMENT", "++"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'DECREMENT' literal object.
>@@ -53,7 +54,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	DECREMENT(2, "DECREMENT", "--");
>+	DECREMENT(2, "DECREMENT", "--"); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'INCREMENT' literal value.
>Index: src/org/eclipse/gmt/modisco/java/TypeDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TypeDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TypeDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -29,7 +30,6 @@
> * 
> * The following features are supported:
> * <ul>
>- * <li>{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getQualifiedName Qualified Name}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getBodyDeclarations Body Declarations}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getCommentsBeforeBody Comments Before Body}</li>
> * <li>{@link org.eclipse.gmt.modisco.java.AbstractTypeDeclaration#getCommentsAfterBody Comments After Body}</li>
>@@ -44,21 +44,6 @@
> */
> public interface AbstractTypeDeclaration extends BodyDeclaration, Type {
> 	/**
>-	 * Returns the value of the 'Qualified Name' attribute.
>-	 * 
>-	 * 
>-	 * If the meaning of the 'Qualified Name' attribute isn't clear,
>-	 * there really should be more of a description here...
>-	 * 
>-	 * 
>-	 * @return the value of the 'Qualified Name' attribute.
>-	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getAbstractTypeDeclaration_QualifiedName()
>-	 * @model unique="false" required="true" transient="true" changeable="false" volatile="true" derived="true" ordered="false"
>-	 * @generated
>-	 */
>-	String getQualifiedName();
>-
>-	/**
> 	 * Returns the value of the 'Body Declarations' containment reference list.
> 	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.BodyDeclaration}.
> 	 * It is bidirectional and its opposite is '{@link org.eclipse.gmt.modisco.java.BodyDeclaration#getAbstractTypeDeclaration Abstract Type Declaration}'.
>Index: src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AssertStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AssertStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AssertStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/PrefixExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/PrefixExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/PrefixExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ImportDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ImportDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ImportDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ThisExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ThisExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ThisExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/BlockComment.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/BlockComment.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/BlockComment.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Manifest.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Manifest.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/Manifest.java	(revision 0)
>@@ -0,0 +1,77 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+import org.eclipse.emf.ecore.EObject;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Manifest'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Manifest#getMainAttributes Main Attributes}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.Manifest#getEntryAttributes Entry Attributes}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifest()
>+ * @model
>+ * @generated
>+ */
>+public interface Manifest extends EObject {
>+	/**
>+	 * Returns the value of the 'Main Attributes' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.ManifestAttribute}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Main Attributes' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Main Attributes' containment reference list.
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifest_MainAttributes()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	EList<ManifestAttribute> getMainAttributes();
>+
>+	/**
>+	 * Returns the value of the 'Entry Attributes' containment reference list.
>+	 * The list contents are of type {@link org.eclipse.gmt.modisco.java.ManifestEntry}.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Entry Attributes' containment reference list isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Entry Attributes' containment reference list.
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getManifest_EntryAttributes()
>+	 * @model containment="true" ordered="false"
>+	 * @generated
>+	 */
>+	EList<ManifestEntry> getEntryAttributes();
>+
>+} // Manifest
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ClassFile.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ClassFile.java	(revision 0)
>+++ src/org/eclipse/gmt/modisco/java/ClassFile.java	(revision 0)
>@@ -0,0 +1,149 @@
>+/**
>+ * *******************************************************************************
>+ * Copyright (c) 2009 Mia-Software.
>+ * All rights reserved. This program and the accompanying materials
>+ * are made available under the terms of the Eclipse Public License v1.0
>+ * which accompanies this distribution, and is available at
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ * 
>+ * Contributors:
>+ * 
>+ * Sébastien Minguet (Mia-Software) - initial API and implementation
>+ * Frédéric Madiot (Mia-Software) - initial API and implementation
>+ * Fabien Giquel (Mia-Software) - initial API and implementation
>+ * Gabriel Barbier (Mia-Software) - initial API and implementation
>+ * Erwan Breton (Sodifrance) - initial API and implementation
>+ * Romain Dervaux (Mia-Software) - initial API and implementation
>+ * *******************************************************************************
>+ *
>+ * $Id$
>+ */
>+package org.eclipse.gmt.modisco.java;
>+
>+import org.eclipse.emf.common.util.EList;
>+
>+/**
>+ * 
>+ * A representation of the model object 'Class File'.
>+ * 
>+ *
>+ * 
>+ * The following features are supported:
>+ * <ul>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ClassFile#getOriginalFilePath Original File Path}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ClassFile#getType Type}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ClassFile#getAttachedSource Attached Source}</li>
>+ * <li>{@link org.eclipse.gmt.modisco.java.ClassFile#getPackage Package}</li>
>+ * </ul>
>+ * 
>+ *
>+ * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getClassFile()
>+ * @model
>+ * @generated
>+ */
>+public interface ClassFile extends NamedElement {
>+	/**
>+	 * Returns the value of the 'Original File Path' attribute.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Original File Path' attribute isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Original File Path' attribute.
>+	 * @see #setOriginalFilePath(String)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getClassFile_OriginalFilePath()
>+	 * @model unique="false" required="true" ordered="false"
>+	 * @generated
>+	 */
>+	String getOriginalFilePath();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ClassFile#getOriginalFilePath Original File Path}' attribute.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Original File Path' attribute.
>+	 * @see #getOriginalFilePath()
>+	 * @generated
>+	 */
>+	void setOriginalFilePath(String value);
>+
>+	/**
>+	 * Returns the value of the 'Type' reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Type' reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Type' reference.
>+	 * @see #setType(AbstractTypeDeclaration)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getClassFile_Type()
>+	 * @model ordered="false"
>+	 * @generated
>+	 */
>+	AbstractTypeDeclaration getType();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ClassFile#getType Type}' reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Type' reference.
>+	 * @see #getType()
>+	 * @generated
>+	 */
>+	void setType(AbstractTypeDeclaration value);
>+
>+	/**
>+	 * Returns the value of the 'Attached Source' reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Attached Source' reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Attached Source' reference.
>+	 * @see #setAttachedSource(CompilationUnit)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getClassFile_AttachedSource()
>+	 * @model ordered="false"
>+	 * @generated
>+	 */
>+	CompilationUnit getAttachedSource();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ClassFile#getAttachedSource Attached Source}' reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Attached Source' reference.
>+	 * @see #getAttachedSource()
>+	 * @generated
>+	 */
>+	void setAttachedSource(CompilationUnit value);
>+
>+	/**
>+	 * Returns the value of the 'Package' reference.
>+	 * 
>+	 * 
>+	 * If the meaning of the 'Package' reference isn't clear,
>+	 * there really should be more of a description here...
>+	 * 
>+	 * 
>+	 * @return the value of the 'Package' reference.
>+	 * @see #setPackage(org.eclipse.gmt.modisco.java.Package)
>+	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getClassFile_Package()
>+	 * @model ordered="false"
>+	 * @generated
>+	 */
>+	org.eclipse.gmt.modisco.java.Package getPackage();
>+
>+	/**
>+	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.ClassFile#getPackage Package}' reference.
>+	 * 
>+	 * 
>+	 * @param value the new value of the 'Package' reference.
>+	 * @see #getPackage()
>+	 * @generated
>+	 */
>+	void setPackage(org.eclipse.gmt.modisco.java.Package value);
>+
>+} // ClassFile
>Index: src/org/eclipse/gmt/modisco/java/BooleanLiteral.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/BooleanLiteral.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/BooleanLiteral.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/LabeledStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/LabeledStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/LabeledStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ThrowStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ThrowStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ThrowStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/DoStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/DoStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/DoStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/BodyDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/BodyDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/BodyDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ConditionalExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ConditionalExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ConditionalExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/VisibilityKind.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/VisibilityKind.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/VisibilityKind.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -43,7 +44,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	NONE(1, "none", "none"),
>+	NONE(1, "none", "none"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'Public' literal object.
>@@ -53,7 +54,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	PUBLIC(2, "public", "public"),
>+	PUBLIC(2, "public", "public"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'Private' literal object.
>@@ -63,7 +64,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	PRIVATE(3, "private", "private"),
>+	PRIVATE(3, "private", "private"), //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'Protected' literal object.
>@@ -73,7 +74,7 @@
> 	 * @generated
> 	 * @ordered
> 	 */
>-	PROTECTED(4, "protected", "protected");
>+	PROTECTED(4, "protected", "protected"); //$NON-NLS-1$ //$NON-NLS-2$
> 
> 	/**
> 	 * The 'None' literal value.
>Index: src/org/eclipse/gmt/modisco/java/ContinueStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ContinueStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ContinueStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -37,7 +38,7 @@
> * @model
> * @generated
> */
>-public interface UnresolvedItemAccess extends Expression {
>+public interface UnresolvedItemAccess extends Expression, NamespaceAccess {
> 	/**
> 	 * Returns the value of the 'Element' reference.
> 	 * 
>@@ -73,12 +74,12 @@
> 	 * 
> 	 * 
> 	 * @return the value of the 'Qualifier' containment reference.
>-	 * @see #setQualifier(Expression)
>+	 * @see #setQualifier(ASTNode)
> 	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getUnresolvedItemAccess_Qualifier()
> 	 * @model containment="true" ordered="false"
> 	 * @generated
> 	 */
>-	Expression getQualifier();
>+	ASTNode getQualifier();
> 
> 	/**
> 	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.UnresolvedItemAccess#getQualifier Qualifier}' containment reference.
>@@ -88,6 +89,6 @@
> 	 * @see #getQualifier()
> 	 * @generated
> 	 */
>-	void setQualifier(Expression value);
>+	void setQualifier(ASTNode value);
> 
> } // UnresolvedItemAccess
>Index: src/org/eclipse/gmt/modisco/java/TypeAccess.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/TypeAccess.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/TypeAccess.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>@@ -37,7 +38,7 @@
> * @model
> * @generated
> */
>-public interface TypeAccess extends Expression {
>+public interface TypeAccess extends Expression, NamespaceAccess {
> 	/**
> 	 * Returns the value of the 'Type' reference.
> 	 * It is bidirectional and its opposite is '{@link org.eclipse.gmt.modisco.java.Type#getUsagesInTypeAccess Usages In Type Access}'.
>@@ -75,12 +76,12 @@
> 	 * 
> 	 * 
> 	 * @return the value of the 'Qualifier' containment reference.
>-	 * @see #setQualifier(Expression)
>+	 * @see #setQualifier(NamespaceAccess)
> 	 * @see org.eclipse.gmt.modisco.java.emf.JavaPackage#getTypeAccess_Qualifier()
> 	 * @model containment="true" ordered="false"
> 	 * @generated
> 	 */
>-	Expression getQualifier();
>+	NamespaceAccess getQualifier();
> 
> 	/**
> 	 * Sets the value of the '{@link org.eclipse.gmt.modisco.java.TypeAccess#getQualifier Qualifier}' containment reference.
>@@ -90,6 +91,6 @@
> 	 * @see #getQualifier()
> 	 * @generated
> 	 */
>-	void setQualifier(Expression value);
>+	void setQualifier(NamespaceAccess value);
> 
> } // TypeAccess
>Index: src/org/eclipse/gmt/modisco/java/NullLiteral.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/NullLiteral.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/NullLiteral.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: src/org/eclipse/gmt/modisco/java/Block.java
>===================================================================
>--- src/org/eclipse/gmt/modisco/java/Block.java	(revision 417)
>+++ src/org/eclipse/gmt/modisco/java/Block.java	(working copy)
>@@ -7,6 +7,7 @@
> * http://www.eclipse.org/legal/epl-v10.html
> * 
> * Contributors:
>+ * 
> * Sébastien Minguet (Mia-Software) - initial API and implementation
> * Frédéric Madiot (Mia-Software) - initial API and implementation
> * Fabien Giquel (Mia-Software) - initial API and implementation
>Index: model/km3ToEcore.readme.txt
>===================================================================
>--- model/km3ToEcore.readme.txt	(revision 417)
>+++ model/km3ToEcore.readme.txt	(working copy)
>@@ -13,7 +13,8 @@
> *
> */
> 
>-After the generation of the ecore file from the KM3 : 
>+Ecore file used to be generated from km3 with km3 tools
>+After the generation of the ecore file from the KM3, there are still manual modifications:
> 
> 1) 
> In the java.ecore file : 
>@@ -29,15 +30,7 @@
> 
> then remove the "PrimitiveTypes" package in the java.ecore file
> 
>-2) Set 'derived', 'transient' and 'volatile' to true on the "QualifiedName" attribute on Metaclasses :
>-	AbstractMethodDeclaration
>-	AbstractTypeDeclaration
>-	ArrayType
>-	Package
>-	ParameterizedType
>-	VariableDeclarationFragment
>-
>-3) If the release of km3toEcore transformation does not support @literalValue annotation
>+2) If the release of km3toEcore transformation does not support @literalValue annotation
> In the EEnums : 
> 	- AssignmentKind
> 	- InfixExpressionKind
>Index: model/java.km3
>===================================================================
>--- model/java.km3	(revision 417)
>+++ model/java.km3	(working copy)
>@@ -13,13 +13,11 @@
> --
> --
> 
>--- @nsURI http://www.eclipse.org/MoDisco/Java
>+-- @nsURI http://www.eclipse.org/MoDisco/Java/0.2.incubation/java
> -- @nsPrefix java
> package java {
> 
> 	abstract class AbstractMethodDeclaration extends BodyDeclaration {
>-		attribute varargs : Boolean;
>-		attribute qualifiedName : String;
> 		reference body[0-1] container : Block;
> 		reference parameters[*] ordered container : SingleVariableDeclaration oppositeOf methodDeclaration;	
> 		reference thrownExceptions[*] ordered container : TypeAccess;
>@@ -36,7 +34,6 @@
> 	}
> 	
> 	abstract class AbstractTypeDeclaration extends BodyDeclaration, Type {
>-		attribute qualifiedName : String;
> 		reference bodyDeclarations[*] ordered container : BodyDeclaration oppositeOf abstractTypeDeclaration;
> 		reference commentsBeforeBody[*] ordered container : Comment;
> 		reference commentsAfterBody[*] ordered container : Comment;
>@@ -59,6 +56,12 @@
> 		reference values[*] ordered container : AnnotationMemberValuePair;
> 	}
> 	
>+	class Archive extends NamedElement {
>+		attribute originalFilePath : String;
>+		reference classFiles[*] container : ClassFile;
>+		reference manifest[0-1] container : Manifest;
>+	}
>+	
> 	class AssertStatement extends Statement {
> 		reference message[0-1] container : Expression;
> 		reference expression container : Expression;
>@@ -67,6 +70,7 @@
> 	abstract class ASTNode {
> 		reference comments[*] ordered container : Comment;
> 		reference originalCompilationUnit[0-1] : CompilationUnit;
>+		reference originalClassFile[0-1] : ClassFile;
> 	}
> 	
> 	class AnnotationMemberValuePair extends NamedElement {
>@@ -108,7 +112,6 @@
> 	}
> 	
> 	class ArrayType extends Type {
>-		attribute qualifiedName : String;
> 		attribute dimensions : Integer;
> 		reference elementType container : TypeAccess ;
> 	}
>@@ -184,6 +187,13 @@
> 		attribute escapedValue : String;
> 	}
> 	
>+	class ClassFile extends NamedElement {
>+		attribute originalFilePath : String;
>+		reference type[0-1] : AbstractTypeDeclaration;
>+		reference attachedSource[0-1] : CompilationUnit;
>+		reference "package"[0-1] : Package;
>+	}
>+	
> 	class ClassInstanceCreation extends Expression, AbstractMethodInvocation {
> 		reference anonymousClassDeclaration[0-1] container : AnonymousClassDeclaration oppositeOf classInstanceCreation;
> 		reference expression[0-1] container : Expression;
>@@ -364,6 +374,21 @@
> 		
> 	}
> 	
>+	class Manifest {
>+		reference mainAttributes [*] container : ManifestAttribute;
>+		reference entryAttributes [*] container : ManifestEntry;
>+	}
>+	
>+	class ManifestAttribute {
>+		attribute key : String;
>+		attribute value : String;
>+	}
>+	
>+	class ManifestEntry {
>+		attribute name : String;
>+		reference attributes [*] container : ManifestAttribute;
>+	}
>+	
> 	-- member can be a MethodDeclaration/Constructor/VariableDeclarationFragment/Type
> 	class MemberRef extends ASTNode {
> 		reference member : NamedElement;
>@@ -401,6 +426,8 @@
> 		reference orphanTypes[*] container : Type;
> 		reference unresolvedItems[*] container : UnresolvedItem;
> 		reference compilationUnits[*] container : CompilationUnit;
>+		reference classFiles[*] container : ClassFile;
>+		reference archives[*] container : Archive;
> 	}
> 	
> 	class Modifier extends ASTNode {
>@@ -423,6 +450,9 @@
> 		attribute proxy : Boolean;
> 		reference usagesInImports[*] : ImportDeclaration oppositeOf importedElement; -- NamedElementRef substitute opposite
> 	}
>+	
>+	abstract class NamespaceAccess extends ASTNode {
>+	}
> 		
> 	class NumberLiteral extends Expression {
> 		attribute tokenValue : String;
>@@ -433,7 +463,6 @@
> 	}
> 	
> 	class Package extends NamedElement {
>-		attribute qualifiedName : String;
> 		reference ownedElements[*] container : AbstractTypeDeclaration oppositeOf "package";
> 		reference model : Model oppositeOf ownedElements;
> 		reference ownedPackages[*] container : Package oppositeOf "package";
>@@ -441,7 +470,7 @@
> 		reference usagesInPackageAccess[*] : PackageAccess oppositeOf "package";
> 	}
> 	
>-	class PackageAccess extends Expression {
>+	class PackageAccess extends NamespaceAccess {
> 		reference "package" : Package oppositeOf usagesInPackageAccess;
> 		reference qualifier[0-1] container : PackageAccess;
> 	}
>@@ -449,7 +478,6 @@
> 	-- arguments types are TypeAccess rather than direct Type reference
> 	-- for injector implementation constraints (unicity and ordering)
> 	class ParameterizedType extends Type {
>-		attribute qualifiedName : String;
> 		reference type container : TypeAccess ;
> 		reference typeArguments[*] ordered container : TypeAccess;
> 	}
>@@ -614,9 +642,10 @@
> 		reference usagesInTypeAccess[*] : TypeAccess oppositeOf type; -- NamedElementRef substitute opposite
> 	}
> 
>-	class TypeAccess extends Expression {
>+	class TypeAccess extends Expression, NamespaceAccess {
> 		reference type : Type oppositeOf usagesInTypeAccess; -- NamedElementRef substitute 
>-		reference qualifier[0-1] container : Expression;
>+		-- qualifier is a TypeAcces or PackageAccess
>+		reference qualifier[0-1] container : NamespaceAccess;
> 	}
> 	
> 	abstract class TypeDeclaration extends AbstractTypeDeclaration {
>@@ -639,9 +668,10 @@
> 	class UnresolvedItem extends NamedElement {
> 	}
> 	
>-	class UnresolvedItemAccess extends Expression {
>+	class UnresolvedItemAccess extends Expression, NamespaceAccess {
> 		reference element[0-1] : UnresolvedItem;
>-		reference qualifier[0-1] container : Expression;
>+		-- qualifier can be a Expression or a NamespaceAccess
>+		reference qualifier[0-1] container : ASTNode;
> 	}
> 	
> 	class UnresolvedAnnotationDeclaration extends AnnotationTypeDeclaration, UnresolvedItem {
>@@ -689,7 +719,6 @@
> 	}
> 	
> 	class VariableDeclarationFragment extends VariableDeclaration {
>-		attribute qualifiedName : String;
> 		reference variablesContainer[0-1] : AbstractVariablesContainer oppositeOf fragments;
> 	}
> 	
>Index: model/java.ecore
>===================================================================
>--- model/java.ecore	(revision 417)
>+++ model/java.ecore	(working copy)
>@@ -1,146 +1,102 @@
> <?xml version="1.0" encoding="ISO-8859-1"?>
>-<ecore:EPackage xmi:version="2.0"
>- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
>- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="java"
>- nsURI="http://www.eclipse.org/MoDisco/Java" nsPrefix="java">
>- <eClassifiers xsi:type="ecore:EClass" name="AbstractMethodDeclaration" abstract="true"
>- eSuperTypes="#//BodyDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="varargs" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" eType="#//Block"
>- containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
>- eType="#//SingleVariableDeclaration" containment="true" eOpposite="#//SingleVariableDeclaration/methodDeclaration"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="thrownExceptions" upperBound="-1"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="typeParameters" upperBound="-1"
>- eType="#//TypeParameter" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInDocComments" ordered="false"
>- upperBound="-1" eType="#//MethodRef" eOpposite="#//MethodRef/method"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usages" ordered="false"
>- upperBound="-1" eType="#//AbstractMethodInvocation" eOpposite="#//AbstractMethodInvocation/method"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AbstractMethodInvocation" abstract="true"
>- eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="method" ordered="false"
>- lowerBound="1" eType="#//AbstractMethodDeclaration" eOpposite="#//AbstractMethodDeclaration/usages"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="typeArguments" upperBound="-1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AbstractTypeDeclaration" abstract="true"
>- eSuperTypes="#//BodyDeclaration #//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclarations" upperBound="-1"
>- eType="#//BodyDeclaration" containment="true" eOpposite="#//BodyDeclaration/abstractTypeDeclaration"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="commentsBeforeBody" upperBound="-1"
>- eType="#//Comment" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="commentsAfterBody" upperBound="-1"
>- eType="#//Comment" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false"
>- eType="#//Package" eOpposite="#//Package/ownedElements"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="superInterfaces" upperBound="-1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AbstractTypeQualifiedExpression" abstract="true"
>- eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AbstractVariablesContainer" abstract="true"
>- eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="fragments" upperBound="-1"
>- eType="#//VariableDeclarationFragment" containment="true" eOpposite="#//VariableDeclarationFragment/variablesContainer"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Annotation" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1"
>- eType="#//AnnotationMemberValuePair" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AssertStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="message" ordered="false"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ASTNode" abstract="true">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="comments" upperBound="-1"
>- eType="#//Comment" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="originalCompilationUnit"
>- ordered="false" eType="#//CompilationUnit"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AnnotationMemberValuePair" eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"
>- lowerBound="1" eType="#//AnnotationTypeMemberDeclaration" eOpposite="#//AnnotationTypeMemberDeclaration/usages"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="value" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AnnotationTypeDeclaration" eSuperTypes="#//AbstractTypeDeclaration"/>
>- <eClassifiers xsi:type="ecore:EClass" name="AnnotationTypeMemberDeclaration" eSuperTypes="#//BodyDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="default" ordered="false"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usages" ordered="false"
>- upperBound="-1" eType="#//AnnotationMemberValuePair" eOpposite="#//AnnotationMemberValuePair/member"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="AnonymousClassDeclaration" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclarations" upperBound="-1"
>- eType="#//BodyDeclaration" containment="true" eOpposite="#//BodyDeclaration/anonymousClassDeclarationOwner"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="classInstanceCreation"
>- ordered="false" lowerBound="1" eType="#//ClassInstanceCreation" eOpposite="#//ClassInstanceCreation/anonymousClassDeclaration"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ArrayAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="array" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="index" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ArrayCreation" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="dimensions" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" ordered="false"
>- eType="#//ArrayInitializer" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ArrayInitializer" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ArrayLengthAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="array" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ArrayType" eSuperTypes="#//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="dimensions" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" ordered="false"
>- lowerBound="1" eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="leftHandSide" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false"
>- unique="false" lowerBound="1" eType="#//AssignmentKind"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="rightHandSide" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>+
>+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
>+ <ecore:EPackage name="java" nsURI="http://www.eclipse.org/MoDisco/Java/0.2.incubation/java" nsPrefix="java">
>+ <eClassifiers xsi:type="ecore:EClass" name="AbstractMethodDeclaration" abstract="true" eSuperTypes="/0/BodyDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" eType="/0/Block" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" eType="/0/SingleVariableDeclaration" containment="true" eOpposite="/0/SingleVariableDeclaration/methodDeclaration"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="thrownExceptions" upperBound="-1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="typeParameters" upperBound="-1" eType="/0/TypeParameter" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInDocComments" ordered="false" upperBound="-1" eType="/0/MethodRef" eOpposite="/0/MethodRef/method"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usages" ordered="false" upperBound="-1" eType="/0/AbstractMethodInvocation" eOpposite="/0/AbstractMethodInvocation/method"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AbstractMethodInvocation" abstract="true" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="method" ordered="false" lowerBound="1" eType="/0/AbstractMethodDeclaration" eOpposite="/0/AbstractMethodDeclaration/usages"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="typeArguments" upperBound="-1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AbstractTypeDeclaration" abstract="true" eSuperTypes="/0/BodyDeclaration /0/Type">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclarations" upperBound="-1" eType="/0/BodyDeclaration" containment="true" eOpposite="/0/BodyDeclaration/abstractTypeDeclaration"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="commentsBeforeBody" upperBound="-1" eType="/0/Comment" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="commentsAfterBody" upperBound="-1" eType="/0/Comment" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false" eType="/0/Package" eOpposite="/0/Package/ownedElements"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="superInterfaces" upperBound="-1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AbstractTypeQualifiedExpression" abstract="true" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AbstractVariablesContainer" abstract="true" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="fragments" upperBound="-1" eType="/0/VariableDeclarationFragment" containment="true" eOpposite="/0/VariableDeclarationFragment/variablesContainer"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Annotation" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="values" upperBound="-1" eType="/0/AnnotationMemberValuePair" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Archive" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalFilePath" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="classFiles" ordered="false" upperBound="-1" eType="/0/ClassFile" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="manifest" ordered="false" eType="/0/Manifest" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AssertStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="message" ordered="false" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ASTNode" abstract="true">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="comments" upperBound="-1" eType="/0/Comment" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="originalCompilationUnit" ordered="false" eType="/0/CompilationUnit"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="originalClassFile" ordered="false" eType="/0/ClassFile"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AnnotationMemberValuePair" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false" lowerBound="1" eType="/0/AnnotationTypeMemberDeclaration" eOpposite="/0/AnnotationTypeMemberDeclaration/usages"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="value" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AnnotationTypeDeclaration" eSuperTypes="/0/AbstractTypeDeclaration"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="AnnotationTypeMemberDeclaration" eSuperTypes="/0/BodyDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="default" ordered="false" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usages" ordered="false" upperBound="-1" eType="/0/AnnotationMemberValuePair" eOpposite="/0/AnnotationMemberValuePair/member"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="AnonymousClassDeclaration" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclarations" upperBound="-1" eType="/0/BodyDeclaration" containment="true" eOpposite="/0/BodyDeclaration/anonymousClassDeclarationOwner"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="classInstanceCreation" ordered="false" lowerBound="1" eType="/0/ClassInstanceCreation" eOpposite="/0/ClassInstanceCreation/anonymousClassDeclaration"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ArrayAccess" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="array" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="index" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ArrayCreation" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="dimensions" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" ordered="false" eType="/0/ArrayInitializer" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ArrayInitializer" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expressions" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ArrayLengthAccess" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="array" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ArrayType" eSuperTypes="/0/Type">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="dimensions" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="elementType" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Assignment" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="leftHandSide" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false" unique="false" lowerBound="1" eType="/0/AssignmentKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="rightHandSide" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="AssignmentKind">
>- <eLiterals name="ASSIGN" value="1" literal="+="/>
>- <eLiterals name="PLUS_ASSIGN" value="2"/>
>+ <eLiterals name="ASSIGN" value="1" literal="="/>
>+ <eLiterals name="PLUS_ASSIGN" value="2" literal="+="/>
> <eLiterals name="MINUS_ASSIGN" value="3" literal="-="/>
> <eLiterals name="TIMES_ASSIGN" value="4" literal="*="/>
> <eLiterals name="DIVIDE_ASSIGN" value="5" literal="/="/>
>@@ -152,162 +108,116 @@
> <eLiterals name="RIGHT_SHIFT_SIGNED_ASSIGN" value="11" literal=">>="/>
> <eLiterals name="RIGHT_SHIFT_UNSIGNED_ASSIGN" value="12" literal=">>>="/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="BodyDeclaration" abstract="true" eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="abstractTypeDeclaration"
>- ordered="false" eType="#//AbstractTypeDeclaration" eOpposite="#//AbstractTypeDeclaration/bodyDeclarations"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
>- eType="#//Annotation" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclarationOwner"
>- ordered="false" eType="#//AnonymousClassDeclaration" eOpposite="#//AnonymousClassDeclaration/bodyDeclarations"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false"
>- lowerBound="1" eType="#//Modifier" containment="true" eOpposite="#//Modifier/bodyDeclaration"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="BooleanLiteral" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="BlockComment" eSuperTypes="#//Comment"/>
>- <eClassifiers xsi:type="ecore:EClass" name="Block" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"
>- eType="#//Statement" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="BreakStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="label" ordered="false"
>- lowerBound="1" eType="#//LabeledStatement" eOpposite="#//LabeledStatement/usagesInBreakStatements"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="CastExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="CatchClause" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="exception" ordered="false"
>- lowerBound="1" eType="#//SingleVariableDeclaration" containment="true" eOpposite="#//SingleVariableDeclaration/catchClause"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Block" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="CharacterLiteral" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ClassInstanceCreation" eSuperTypes="#//Expression #//AbstractMethodInvocation">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclaration"
>- ordered="false" eType="#//AnonymousClassDeclaration" containment="true" eOpposite="#//AnonymousClassDeclaration/classInstanceCreation"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ConstructorDeclaration" eSuperTypes="#//AbstractMethodDeclaration"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ConditionalExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="elseExpression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="thenExpression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ConstructorInvocation" eSuperTypes="#//Statement #//AbstractMethodInvocation"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ClassDeclaration" eSuperTypes="#//TypeDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="superClass" ordered="false"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Comment" abstract="true" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="enclosedByParent" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefixOfParent" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="CompilationUnit" eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalFilePath" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="commentList" upperBound="-1"
>- eType="#//Comment"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1"
>- eType="#//ImportDeclaration" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false"
>- eType="#//Package"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="types" upperBound="-1"
>- eType="#//AbstractTypeDeclaration"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ContinueStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="label" ordered="false"
>- lowerBound="1" eType="#//LabeledStatement" eOpposite="#//LabeledStatement/usagesInContinueStatements"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="DoStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Statement" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="EmptyStatement" eSuperTypes="#//Statement"/>
>- <eClassifiers xsi:type="ecore:EClass" name="EnhancedForStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Statement" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false"
>- lowerBound="1" eType="#//SingleVariableDeclaration" containment="true" eOpposite="#//SingleVariableDeclaration/enhancedForStatement"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="EnumConstantDeclaration" eSuperTypes="#//BodyDeclaration #//VariableDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclaration"
>- ordered="false" eType="#//AnonymousClassDeclaration" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="EnumDeclaration" eSuperTypes="#//AbstractTypeDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="enumConstants" upperBound="-1"
>- eType="#//EnumConstantDeclaration" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="#//ASTNode"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ExpressionStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="FieldAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="field" ordered="false"
>- lowerBound="1" eType="#//SingleVariableAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="FieldDeclaration" eSuperTypes="#//BodyDeclaration #//AbstractVariablesContainer"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ForStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="updaters" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Statement" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="IfStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="thenStatement" ordered="false"
>- lowerBound="1" eType="#//Statement" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="elseStatement" ordered="false"
>- eType="#//Statement" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ImportDeclaration" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" ordered="false"
>- unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="importedElement" ordered="false"
>- lowerBound="1" eType="#//NamedElement" eOpposite="#//NamedElement/usagesInImports"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="InfixExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false"
>- unique="false" lowerBound="1" eType="#//InfixExpressionKind"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="extendedOperands" upperBound="-1"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="BodyDeclaration" abstract="true" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="abstractTypeDeclaration" ordered="false" eType="/0/AbstractTypeDeclaration" eOpposite="/0/AbstractTypeDeclaration/bodyDeclarations"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" eType="/0/Annotation" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclarationOwner" ordered="false" eType="/0/AnonymousClassDeclaration" eOpposite="/0/AnonymousClassDeclaration/bodyDeclarations"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false" lowerBound="1" eType="/0/Modifier" containment="true" eOpposite="/0/Modifier/bodyDeclaration"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="BooleanLiteral" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="BlockComment" eSuperTypes="/0/Comment"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="Block" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1" eType="/0/Statement" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="BreakStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="label" ordered="false" lowerBound="1" eType="/0/LabeledStatement" eOpposite="/0/LabeledStatement/usagesInBreakStatements"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="CastExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="CatchClause" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="exception" ordered="false" lowerBound="1" eType="/0/SingleVariableDeclaration" containment="true" eOpposite="/0/SingleVariableDeclaration/catchClause"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Block" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="CharacterLiteral" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ClassFile" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalFilePath" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" eType="/0/AbstractTypeDeclaration"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="attachedSource" ordered="false" eType="/0/CompilationUnit"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false" eType="/0/Package"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ClassInstanceCreation" eSuperTypes="/0/Expression /0/AbstractMethodInvocation">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclaration" ordered="false" eType="/0/AnonymousClassDeclaration" containment="true" eOpposite="/0/AnonymousClassDeclaration/classInstanceCreation"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ConstructorDeclaration" eSuperTypes="/0/AbstractMethodDeclaration"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ConditionalExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="elseExpression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="thenExpression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ConstructorInvocation" eSuperTypes="/0/Statement /0/AbstractMethodInvocation"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ClassDeclaration" eSuperTypes="/0/TypeDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="superClass" ordered="false" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Comment" abstract="true" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="enclosedByParent" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="prefixOfParent" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="CompilationUnit" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="originalFilePath" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="commentList" upperBound="-1" eType="/0/Comment"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="imports" upperBound="-1" eType="/0/ImportDeclaration" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false" eType="/0/Package"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="types" upperBound="-1" eType="/0/AbstractTypeDeclaration"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ContinueStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="label" ordered="false" lowerBound="1" eType="/0/LabeledStatement" eOpposite="/0/LabeledStatement/usagesInContinueStatements"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="DoStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Statement" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="EmptyStatement" eSuperTypes="/0/Statement"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="EnhancedForStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Statement" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameter" ordered="false" lowerBound="1" eType="/0/SingleVariableDeclaration" containment="true" eOpposite="/0/SingleVariableDeclaration/enhancedForStatement"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="EnumConstantDeclaration" eSuperTypes="/0/BodyDeclaration /0/VariableDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="anonymousClassDeclaration" ordered="false" eType="/0/AnonymousClassDeclaration" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="EnumDeclaration" eSuperTypes="/0/AbstractTypeDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="enumConstants" upperBound="-1" eType="/0/EnumConstantDeclaration" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Expression" abstract="true" eSuperTypes="/0/ASTNode"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ExpressionStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="FieldAccess" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="field" ordered="false" lowerBound="1" eType="/0/SingleVariableAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="FieldDeclaration" eSuperTypes="/0/BodyDeclaration /0/AbstractVariablesContainer"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ForStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="updaters" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="initializers" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Statement" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="IfStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="thenStatement" ordered="false" lowerBound="1" eType="/0/Statement" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="elseStatement" ordered="false" eType="/0/Statement" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ImportDeclaration" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" ordered="false" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="importedElement" ordered="false" lowerBound="1" eType="/0/NamedElement" eOpposite="/0/NamedElement/usagesInImports"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="InfixExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false" unique="false" lowerBound="1" eType="/0/InfixExpressionKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="extendedOperands" upperBound="-1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="InfixExpressionKind">
> <eLiterals name="TIMES" value="1" literal="*"/>
> <eLiterals name="DIVIDE" value="2" literal="/"/>
>@@ -329,172 +239,126 @@
> <eLiterals name="CONDITIONAL_AND" value="18" literal="&amp;&amp;"/>
> <eLiterals name="CONDITIONAL_OR" value="19" literal="||"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">
>- <eLiterals name="none" value="1"/>
>- <eLiterals name="abstract" value="2"/>
>- <eLiterals name="final" value="3"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Initializer" eSuperTypes="#//BodyDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Block" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="InstanceofExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" ordered="false"
>- lowerBound="1" eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="InterfaceDeclaration" eSuperTypes="#//TypeDeclaration"/>
>- <eClassifiers xsi:type="ecore:EClass" name="Javadoc" eSuperTypes="#//Comment">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="tags" upperBound="-1" eType="#//TagElement"
>- containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="LabeledStatement" eSuperTypes="#//NamedElement #//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Statement" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInBreakStatements"
>- ordered="false" upperBound="-1" eType="#//BreakStatement" eOpposite="#//BreakStatement/label"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInContinueStatements"
>- ordered="false" upperBound="-1" eType="#//ContinueStatement" eOpposite="#//ContinueStatement/label"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="LineComment" eSuperTypes="#//Comment"/>
>- <eClassifiers xsi:type="ecore:EClass" name="MemberRef" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false"
>- lowerBound="1" eType="#//NamedElement"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="MethodDeclaration" eSuperTypes="#//AbstractMethodDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="extraArrayDimensions" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" ordered="false"
>- lowerBound="1" eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedMethodDeclaration"
>- ordered="false" eType="#//MethodDeclaration" eOpposite="#//MethodDeclaration/redefinitions"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="redefinitions" ordered="false"
>- upperBound="-1" eType="#//MethodDeclaration" eOpposite="#//MethodDeclaration/redefinedMethodDeclaration"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="MethodInvocation" eSuperTypes="#//Expression #//AbstractMethodInvocation">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="MethodRef" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="method" ordered="false"
>- lowerBound="1" eType="#//AbstractMethodDeclaration" eOpposite="#//AbstractMethodDeclaration/usagesInDocComments"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1"
>- eType="#//MethodRefParameter" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="MethodRefParameter" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
>- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="varargs" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Model">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
>- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" ordered="false"
>- upperBound="-1" eType="#//Package" containment="true" eOpposite="#//Package/model"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="orphanTypes" ordered="false"
>- upperBound="-1" eType="#//Type" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="unresolvedItems" ordered="false"
>- upperBound="-1" eType="#//UnresolvedItem" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="compilationUnits" ordered="false"
>- upperBound="-1" eType="#//CompilationUnit" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Modifier" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" ordered="false"
>- unique="false" lowerBound="1" eType="#//VisibilityKind"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" ordered="false"
>- unique="false" lowerBound="1" eType="#//InheritanceKind"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="transient" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="volatile" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="native" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="strictfp" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="synchronized" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclaration" ordered="false"
>- eType="#//BodyDeclaration" eOpposite="#//BodyDeclaration/modifier"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="singleVariableDeclaration"
>- ordered="false" eType="#//SingleVariableDeclaration" eOpposite="#//SingleVariableDeclaration/modifier"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="variableDeclarationStatement"
>- ordered="false" eType="#//VariableDeclarationStatement" eOpposite="#//VariableDeclarationStatement/modifier"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="variableDeclarationExpression"
>- ordered="false" eType="#//VariableDeclarationExpression" eOpposite="#//VariableDeclarationExpression/modifier"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false"
>- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInImports" ordered="false"
>- upperBound="-1" eType="#//ImportDeclaration" eOpposite="#//ImportDeclaration/importedElement"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="NumberLiteral" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="tokenValue" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="NullLiteral" eSuperTypes="#//Expression"/>
>- <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" ordered="false"
>- upperBound="-1" eType="#//AbstractTypeDeclaration" containment="true" eOpposite="#//AbstractTypeDeclaration/package"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="model" ordered="false"
>- lowerBound="1" eType="#//Model" eOpposite="#//Model/ownedElements"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="ownedPackages" ordered="false"
>- upperBound="-1" eType="#//Package" containment="true" eOpposite="#//Package/package"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false"
>- lowerBound="1" eType="#//Package" eOpposite="#//Package/ownedPackages"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInPackageAccess"
>- ordered="false" upperBound="-1" eType="#//PackageAccess" eOpposite="#//PackageAccess/package"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="PackageAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false"
>- lowerBound="1" eType="#//Package" eOpposite="#//Package/usagesInPackageAccess"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//PackageAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ParameterizedType" eSuperTypes="#//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="typeArguments" upperBound="-1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ParenthesizedExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="PostfixExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false"
>- unique="false" lowerBound="1" eType="#//PostfixExpressionKind"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="operand" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EEnum" name="InheritanceKind">
>+ <eLiterals name="none" value="1"/>
>+ <eLiterals name="abstract" value="2"/>
>+ <eLiterals name="final" value="3"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Initializer" eSuperTypes="/0/BodyDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Block" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="InstanceofExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="rightOperand" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="leftOperand" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="InterfaceDeclaration" eSuperTypes="/0/TypeDeclaration"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="Javadoc" eSuperTypes="/0/Comment">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="tags" upperBound="-1" eType="/0/TagElement" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="LabeledStatement" eSuperTypes="/0/NamedElement /0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Statement" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInBreakStatements" ordered="false" upperBound="-1" eType="/0/BreakStatement" eOpposite="/0/BreakStatement/label"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInContinueStatements" ordered="false" upperBound="-1" eType="/0/ContinueStatement" eOpposite="/0/ContinueStatement/label"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="LineComment" eSuperTypes="/0/Comment"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="Manifest">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="mainAttributes" ordered="false" upperBound="-1" eType="/0/ManifestAttribute" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="entryAttributes" ordered="false" upperBound="-1" eType="/0/ManifestEntry" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ManifestAttribute">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="key" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ManifestEntry">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="attributes" ordered="false" upperBound="-1" eType="/0/ManifestAttribute" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="MemberRef" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="member" ordered="false" lowerBound="1" eType="/0/NamedElement"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="MethodDeclaration" eSuperTypes="/0/AbstractMethodDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="extraArrayDimensions" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="redefinedMethodDeclaration" ordered="false" eType="/0/MethodDeclaration" eOpposite="/0/MethodDeclaration/redefinitions"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="redefinitions" ordered="false" upperBound="-1" eType="/0/MethodDeclaration" eOpposite="/0/MethodDeclaration/redefinedMethodDeclaration"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="MethodInvocation" eSuperTypes="/0/Expression /0/AbstractMethodInvocation">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="MethodRef" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="method" ordered="false" lowerBound="1" eType="/0/AbstractMethodDeclaration" eOpposite="/0/AbstractMethodDeclaration/usagesInDocComments"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="parameters" upperBound="-1" eType="/0/MethodRefParameter" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="MethodRefParameter" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="varargs" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Model">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" ordered="false" upperBound="-1" eType="/0/Package" containment="true" eOpposite="/0/Package/model"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="orphanTypes" ordered="false" upperBound="-1" eType="/0/Type" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="unresolvedItems" ordered="false" upperBound="-1" eType="/0/UnresolvedItem" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="compilationUnits" ordered="false" upperBound="-1" eType="/0/CompilationUnit" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="classFiles" ordered="false" upperBound="-1" eType="/0/ClassFile" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="archives" ordered="false" upperBound="-1" eType="/0/Archive" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Modifier" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" ordered="false" unique="false" lowerBound="1" eType="/0/VisibilityKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="inheritance" ordered="false" unique="false" lowerBound="1" eType="/0/InheritanceKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="static" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="transient" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="volatile" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="native" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="strictfp" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="synchronized" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="bodyDeclaration" ordered="false" eType="/0/BodyDeclaration" eOpposite="/0/BodyDeclaration/modifier"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="singleVariableDeclaration" ordered="false" eType="/0/SingleVariableDeclaration" eOpposite="/0/SingleVariableDeclaration/modifier"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="variableDeclarationStatement" ordered="false" eType="/0/VariableDeclarationStatement" eOpposite="/0/VariableDeclarationStatement/modifier"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="variableDeclarationExpression" ordered="false" eType="/0/VariableDeclarationExpression" eOpposite="/0/VariableDeclarationExpression/modifier"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="NamedElement" abstract="true" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="proxy" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInImports" ordered="false" upperBound="-1" eType="/0/ImportDeclaration" eOpposite="/0/ImportDeclaration/importedElement"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="NamespaceAccess" abstract="true" eSuperTypes="/0/ASTNode"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="NumberLiteral" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="tokenValue" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="NullLiteral" eSuperTypes="/0/Expression"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="Package" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="ownedElements" ordered="false" upperBound="-1" eType="/0/AbstractTypeDeclaration" containment="true" eOpposite="/0/AbstractTypeDeclaration/package"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="model" ordered="false" lowerBound="1" eType="/0/Model" eOpposite="/0/Model/ownedElements"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="ownedPackages" ordered="false" upperBound="-1" eType="/0/Package" containment="true" eOpposite="/0/Package/package"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false" lowerBound="1" eType="/0/Package" eOpposite="/0/Package/ownedPackages"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInPackageAccess" ordered="false" upperBound="-1" eType="/0/PackageAccess" eOpposite="/0/PackageAccess/package"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="PackageAccess" eSuperTypes="/0/NamespaceAccess">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="package" ordered="false" lowerBound="1" eType="/0/Package" eOpposite="/0/Package/usagesInPackageAccess"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/PackageAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ParameterizedType" eSuperTypes="/0/Type">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="typeArguments" upperBound="-1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ParenthesizedExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="PostfixExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false" unique="false" lowerBound="1" eType="/0/PostfixExpressionKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="operand" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="PostfixExpressionKind">
> <eLiterals name="INCREMENT" value="1" literal="++"/>
> <eLiterals name="DECREMENT" value="2" literal="--"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="PrefixExpression" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false"
>- unique="false" lowerBound="1" eType="#//PrefixExpressionKind"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="operand" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrefixExpression" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="operator" ordered="false" unique="false" lowerBound="1" eType="/0/PrefixExpressionKind"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="operand" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
> <eClassifiers xsi:type="ecore:EEnum" name="PrefixExpressionKind">
> <eLiterals name="INCREMENT" value="1" literal="++"/>
> <eLiterals name="DECREMENT" value="2" literal="--"/>
>@@ -503,190 +367,141 @@
> <eLiterals name="COMPLEMENT" value="5" literal="~"/>
> <eLiterals name="NOT" value="6" literal="!"/>
> </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType" eSuperTypes="#//Type"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeBoolean" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeByte" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeChar" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeDouble" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeShort" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeFloat" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeInt" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeLong" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeVoid" eSuperTypes="#//PrimitiveType"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ReturnStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SingleVariableAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false"
>- lowerBound="1" eType="#//VariableDeclaration" eOpposite="#//VariableDeclaration/usageInVariableAccess"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SingleVariableDeclaration" eSuperTypes="#//VariableDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false"
>- lowerBound="1" eType="#//Modifier" containment="true" eOpposite="#//Modifier/singleVariableDeclaration"/>
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="varargs" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
>- eType="#//Annotation" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="methodDeclaration" ordered="false"
>- eType="#//AbstractMethodDeclaration" eOpposite="#//AbstractMethodDeclaration/parameters"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="catchClause" ordered="false"
>- eType="#//CatchClause" eOpposite="#//CatchClause/exception"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="enhancedForStatement" ordered="false"
>- eType="#//EnhancedForStatement" eOpposite="#//EnhancedForStatement/parameter"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Statement" abstract="true" eSuperTypes="#//ASTNode"/>
>- <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SuperConstructorInvocation" eSuperTypes="#//Statement #//AbstractMethodInvocation">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SuperFieldAccess" eSuperTypes="#//AbstractTypeQualifiedExpression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="field" ordered="false"
>- lowerBound="1" eType="#//SingleVariableAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SuperMethodInvocation" eSuperTypes="#//AbstractTypeQualifiedExpression #//AbstractMethodInvocation"/>
>- <eClassifiers xsi:type="ecore:EClass" name="SwitchCase" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SwitchStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1"
>- eType="#//Statement" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="SynchronizedStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Block" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TagElement" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="tagName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="fragments" upperBound="-1"
>- eType="#//ASTNode" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TextElement" eSuperTypes="#//ASTNode">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" ordered="false" unique="false"
>- lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="ThisExpression" eSuperTypes="#//AbstractTypeQualifiedExpression"/>
>- <eClassifiers xsi:type="ecore:EClass" name="ThrowStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TryStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Block" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="finally" ordered="false"
>- eType="#//Block" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="catchClauses" upperBound="-1"
>- eType="#//CatchClause" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="Type" abstract="true" eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInTypeAccess" ordered="false"
>- upperBound="-1" eType="#//TypeAccess" eOpposite="#//TypeAccess/type"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//Type" eOpposite="#//Type/usagesInTypeAccess"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeDeclaration" abstract="true" eSuperTypes="#//AbstractTypeDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="typeParameters" upperBound="-1"
>- eType="#//TypeParameter" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeDeclarationStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="declaration" ordered="false"
>- lowerBound="1" eType="#//AbstractTypeDeclaration" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeLiteral" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="TypeParameter" eSuperTypes="#//Type">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" upperBound="-1"
>- eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItem" eSuperTypes="#//NamedElement"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItemAccess" eSuperTypes="#//Expression">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="element" ordered="false"
>- eType="#//UnresolvedItem"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false"
>- eType="#//Expression" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedAnnotationDeclaration" eSuperTypes="#//AnnotationTypeDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedAnnotationTypeMemberDeclaration"
>- eSuperTypes="#//AnnotationTypeMemberDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedClassDeclaration" eSuperTypes="#//ClassDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedEnumDeclaration" eSuperTypes="#//EnumDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedInterfaceDeclaration" eSuperTypes="#//InterfaceDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedLabeledStatement" eSuperTypes="#//LabeledStatement #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedMethodDeclaration" eSuperTypes="#//MethodDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedSingleVariableDeclaration"
>- eSuperTypes="#//SingleVariableDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedType" eSuperTypes="#//Type #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedTypeDeclaration" eSuperTypes="#//AbstractTypeDeclaration #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="UnresolvedVariableDeclarationFragment"
>- eSuperTypes="#//VariableDeclarationFragment #//UnresolvedItem"/>
>- <eClassifiers xsi:type="ecore:EClass" name="VariableDeclaration" abstract="true"
>- eSuperTypes="#//NamedElement">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="extraArrayDimensions" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" ordered="false"
>- eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="usageInVariableAccess"
>- ordered="false" upperBound="-1" eType="#//SingleVariableAccess" eOpposite="#//SingleVariableAccess/variable"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationExpression" eSuperTypes="#//Expression #//AbstractVariablesContainer">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false"
>- lowerBound="1" eType="#//Modifier" containment="true" eOpposite="#//Modifier/variableDeclarationExpression"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
>- eType="#//Annotation" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationFragment" eSuperTypes="#//VariableDeclaration">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="qualifiedName" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
>- changeable="false" volatile="true" transient="true" derived="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="variablesContainer" ordered="false"
>- eType="#//AbstractVariablesContainer" eOpposite="#//AbstractVariablesContainer/fragments"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationStatement" eSuperTypes="#//Statement #//AbstractVariablesContainer">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="extraArrayDimensions" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false"
>- lowerBound="1" eType="#//Modifier" containment="true" eOpposite="#//Modifier/variableDeclarationStatement"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
>- eType="#//Annotation" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">
>- <eLiterals name="none" value="1"/>
>- <eLiterals name="public" value="2"/>
>- <eLiterals name="private" value="3"/>
>- <eLiterals name="protected" value="4"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="WildCardType" eSuperTypes="#//Type">
>- <eStructuralFeatures xsi:type="ecore:EAttribute" name="upperBound" ordered="false"
>- unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="bound" ordered="false"
>- lowerBound="1" eType="#//TypeAccess" containment="true"/>
>- </eClassifiers>
>- <eClassifiers xsi:type="ecore:EClass" name="WhileStatement" eSuperTypes="#//Statement">
>- <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false"
>- lowerBound="1" eType="#//Expression" containment="true"/>
>- <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1"
>- eType="#//Statement" containment="true"/>
>- </eClassifiers>
>-</ecore:EPackage>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveType" eSuperTypes="/0/Type"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeBoolean" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeByte" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeChar" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeDouble" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeShort" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeFloat" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeInt" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeLong" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="PrimitiveTypeVoid" eSuperTypes="/0/PrimitiveType"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ReturnStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SingleVariableAccess" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="variable" ordered="false" lowerBound="1" eType="/0/VariableDeclaration" eOpposite="/0/VariableDeclaration/usageInVariableAccess"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SingleVariableDeclaration" eSuperTypes="/0/VariableDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false" lowerBound="1" eType="/0/Modifier" containment="true" eOpposite="/0/Modifier/singleVariableDeclaration"/>
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="varargs" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" eType="/0/Annotation" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="methodDeclaration" ordered="false" eType="/0/AbstractMethodDeclaration" eOpposite="/0/AbstractMethodDeclaration/parameters"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="catchClause" ordered="false" eType="/0/CatchClause" eOpposite="/0/CatchClause/exception"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="enhancedForStatement" ordered="false" eType="/0/EnhancedForStatement" eOpposite="/0/EnhancedForStatement/parameter"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Statement" abstract="true" eSuperTypes="/0/ASTNode"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="StringLiteral" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="escapedValue" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SuperConstructorInvocation" eSuperTypes="/0/Statement /0/AbstractMethodInvocation">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SuperFieldAccess" eSuperTypes="/0/AbstractTypeQualifiedExpression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="field" ordered="false" lowerBound="1" eType="/0/SingleVariableAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SuperMethodInvocation" eSuperTypes="/0/AbstractTypeQualifiedExpression /0/AbstractMethodInvocation"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="SwitchCase" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="default" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SwitchStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="statements" upperBound="-1" eType="/0/Statement" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="SynchronizedStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Block" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TagElement" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="tagName" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="fragments" upperBound="-1" eType="/0/ASTNode" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TextElement" eSuperTypes="/0/ASTNode">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="text" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="ThisExpression" eSuperTypes="/0/AbstractTypeQualifiedExpression"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="ThrowStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TryStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Block" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="finally" ordered="false" eType="/0/Block" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="catchClauses" upperBound="-1" eType="/0/CatchClause" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="Type" abstract="true" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usagesInTypeAccess" ordered="false" upperBound="-1" eType="/0/TypeAccess" eOpposite="/0/TypeAccess/type"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeAccess" eSuperTypes="/0/Expression /0/NamespaceAccess">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/Type" eOpposite="/0/Type/usagesInTypeAccess"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/NamespaceAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeDeclaration" abstract="true" eSuperTypes="/0/AbstractTypeDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="typeParameters" upperBound="-1" eType="/0/TypeParameter" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeDeclarationStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="declaration" ordered="false" lowerBound="1" eType="/0/AbstractTypeDeclaration" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeLiteral" eSuperTypes="/0/Expression">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="type" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="TypeParameter" eSuperTypes="/0/Type">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="bounds" upperBound="-1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItem" eSuperTypes="/0/NamedElement"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedItemAccess" eSuperTypes="/0/Expression /0/NamespaceAccess">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="element" ordered="false" eType="/0/UnresolvedItem"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="qualifier" ordered="false" eType="/0/ASTNode" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedAnnotationDeclaration" eSuperTypes="/0/AnnotationTypeDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedAnnotationTypeMemberDeclaration" eSuperTypes="/0/AnnotationTypeMemberDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedClassDeclaration" eSuperTypes="/0/ClassDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedEnumDeclaration" eSuperTypes="/0/EnumDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedInterfaceDeclaration" eSuperTypes="/0/InterfaceDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedLabeledStatement" eSuperTypes="/0/LabeledStatement /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedMethodDeclaration" eSuperTypes="/0/MethodDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedSingleVariableDeclaration" eSuperTypes="/0/SingleVariableDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedType" eSuperTypes="/0/Type /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedTypeDeclaration" eSuperTypes="/0/AbstractTypeDeclaration /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="UnresolvedVariableDeclarationFragment" eSuperTypes="/0/VariableDeclarationFragment /0/UnresolvedItem"/>
>+ <eClassifiers xsi:type="ecore:EClass" name="VariableDeclaration" abstract="true" eSuperTypes="/0/NamedElement">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="extraArrayDimensions" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="initializer" ordered="false" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="usageInVariableAccess" ordered="false" upperBound="-1" eType="/0/SingleVariableAccess" eOpposite="/0/SingleVariableAccess/variable"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationExpression" eSuperTypes="/0/Expression /0/AbstractVariablesContainer">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false" lowerBound="1" eType="/0/Modifier" containment="true" eOpposite="/0/Modifier/variableDeclarationExpression"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" eType="/0/Annotation" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationFragment" eSuperTypes="/0/VariableDeclaration">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="variablesContainer" ordered="false" eType="/0/AbstractVariablesContainer" eOpposite="/0/AbstractVariablesContainer/fragments"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="VariableDeclarationStatement" eSuperTypes="/0/Statement /0/AbstractVariablesContainer">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="extraArrayDimensions" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="modifier" ordered="false" lowerBound="1" eType="/0/Modifier" containment="true" eOpposite="/0/Modifier/variableDeclarationStatement"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1" eType="/0/Annotation" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EEnum" name="VisibilityKind">
>+ <eLiterals name="none" value="1"/>
>+ <eLiterals name="public" value="2"/>
>+ <eLiterals name="private" value="3"/>
>+ <eLiterals name="protected" value="4"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="WildCardType" eSuperTypes="/0/Type">
>+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="upperBound" ordered="false" unique="false" lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="bound" ordered="false" lowerBound="1" eType="/0/TypeAccess" containment="true"/>
>+ </eClassifiers>
>+ <eClassifiers xsi:type="ecore:EClass" name="WhileStatement" eSuperTypes="/0/Statement">
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="expression" ordered="false" lowerBound="1" eType="/0/Expression" containment="true"/>
>+ <eStructuralFeatures xsi:type="ecore:EReference" name="body" ordered="false" lowerBound="1" eType="/0/Statement" containment="true"/>
>+ </eClassifiers>
>+ </ecore:EPackage>
>+ <ecore:EPackage name="PrimitiveTypes">
>+ <eClassifiers xsi:type="ecore:EDataType" name="Boolean"/>
>+ <eClassifiers xsi:type="ecore:EDataType" name="Integer"/>
>+ <eClassifiers xsi:type="ecore:EDataType" name="String"/>
>+ </ecore:EPackage>
>+</xmi:XMI>
>Index: model/java.genmodel
>===================================================================
>--- model/java.genmodel	(revision 417)
>+++ model/java.genmodel	(working copy)
>@@ -1,481 +1,502 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <genmodel:GenModel xmi:version="2.0"
> xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
>- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009 Mia-Software.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA; SÃ©bastien Minguet (Mia-Software) - initial API and implementation&#xD;&#xA; FrÃ©dÃ©ric Madiot (Mia-Software) - initial API and implementation&#xD;&#xA; Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA; Gabriel Barbier (Mia-Software) - initial API and implementation&#xD;&#xA; Erwan Breton (Sodifrance) - initial API and implementation&#xD;&#xA; Romain Dervaux (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"
>+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009 Mia-Software.&#xD;&#xA;All rights reserved. This program and the accompanying materials&#xD;&#xA;are made available under the terms of the Eclipse Public License v1.0&#xD;&#xA;which accompanies this distribution, and is available at&#xD;&#xA;http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA;&#xD;&#xA;Contributors:&#xD;&#xA;&#xD;&#xA; SÃ©bastien Minguet (Mia-Software) - initial API and implementation&#xD;&#xA; FrÃ©dÃ©ric Madiot (Mia-Software) - initial API and implementation&#xD;&#xA; Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA; Gabriel Barbier (Mia-Software) - initial API and implementation&#xD;&#xA; Erwan Breton (Sodifrance) - initial API and implementation&#xD;&#xA; Romain Dervaux (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"
> modelDirectory="/org.eclipse.gmt.modisco.java/src" modelPluginID="org.eclipse.gmt.modisco.java"
>- modelName="Java" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
>- copyrightFields="false">
>+ forceOverwrite="true" modelName="Java" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
>+ featureMapWrapperInternalInterface="" importerID="org.eclipse.emf.importer.ecore"
>+ complianceLevel="5.0" copyrightFields="false">
> <foreignModel>java.ecore</foreignModel>
> <genPackages prefix="Java" basePackage="org.eclipse.gmt.modisco" disposableProviderFactory="true"
> loadInitialization="true" metaDataPackageSuffix="emf" classPackageSuffix="emf.impl"
> utilityPackageSuffix="emf.util" providerPackageSuffix="emf.provider" presentationPackageSuffix="emf.presentation"
>- testsPackageSuffix="emf.tests" literalsInterface="false" ecorePackage="java.ecore#/">
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#//AssignmentKind">
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/PLUS_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/MINUS_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/TIMES_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/DIVIDE_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/BIT_AND_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/BIT_OR_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/BIT_XOR_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/REMAINDER_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/LEFT_SHIFT_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/RIGHT_SHIFT_SIGNED_ASSIGN"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//AssignmentKind/RIGHT_SHIFT_UNSIGNED_ASSIGN"/>
>+ testsPackageSuffix="emf.tests" literalsInterface="false" ecorePackage="java.ecore#/0">
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#/0/AssignmentKind">
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/PLUS_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/MINUS_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/TIMES_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/DIVIDE_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/BIT_AND_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/BIT_OR_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/BIT_XOR_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/REMAINDER_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/LEFT_SHIFT_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/RIGHT_SHIFT_SIGNED_ASSIGN"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/AssignmentKind/RIGHT_SHIFT_UNSIGNED_ASSIGN"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#//InfixExpressionKind">
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/TIMES"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/DIVIDE"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/REMAINDER"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/PLUS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/MINUS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/LEFT_SHIFT"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/RIGHT_SHIFT_SIGNED"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/RIGHT_SHIFT_UNSIGNED"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/LESS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/GREATER"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/LESS_EQUALS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/GREATER_EQUALS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/EQUALS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/NOT_EQUALS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/XOR"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/AND"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/OR"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/CONDITIONAL_AND"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InfixExpressionKind/CONDITIONAL_OR"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#/0/InfixExpressionKind">
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/TIMES"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/DIVIDE"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/REMAINDER"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/PLUS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/MINUS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/LEFT_SHIFT"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/RIGHT_SHIFT_SIGNED"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/RIGHT_SHIFT_UNSIGNED"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/LESS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/GREATER"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/LESS_EQUALS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/GREATER_EQUALS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/EQUALS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/NOT_EQUALS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/XOR"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/AND"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/OR"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/CONDITIONAL_AND"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InfixExpressionKind/CONDITIONAL_OR"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#//InheritanceKind">
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InheritanceKind/none"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InheritanceKind/abstract"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//InheritanceKind/final"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#/0/InheritanceKind">
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InheritanceKind/none"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InheritanceKind/abstract"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/InheritanceKind/final"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#//PostfixExpressionKind">
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PostfixExpressionKind/INCREMENT"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PostfixExpressionKind/DECREMENT"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#/0/PostfixExpressionKind">
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PostfixExpressionKind/INCREMENT"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PostfixExpressionKind/DECREMENT"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#//PrefixExpressionKind">
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PrefixExpressionKind/INCREMENT"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PrefixExpressionKind/DECREMENT"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PrefixExpressionKind/PLUS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PrefixExpressionKind/MINUS"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PrefixExpressionKind/COMPLEMENT"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//PrefixExpressionKind/NOT"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#/0/PrefixExpressionKind">
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PrefixExpressionKind/INCREMENT"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PrefixExpressionKind/DECREMENT"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PrefixExpressionKind/PLUS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PrefixExpressionKind/MINUS"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PrefixExpressionKind/COMPLEMENT"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/PrefixExpressionKind/NOT"/>
> </genEnums>
>- <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#//VisibilityKind">
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//VisibilityKind/none"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//VisibilityKind/public"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//VisibilityKind/private"/>
>- <genEnumLiterals ecoreEnumLiteral="java.ecore#//VisibilityKind/protected"/>
>+ <genEnums typeSafeEnumCompatible="false" ecoreEnum="java.ecore#/0/VisibilityKind">
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/VisibilityKind/none"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/VisibilityKind/public"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/VisibilityKind/private"/>
>+ <genEnumLiterals ecoreEnumLiteral="java.ecore#/0/VisibilityKind/protected"/>
> </genEnums>
>- <genClasses image="false" ecoreClass="java.ecore#//AbstractMethodDeclaration">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//AbstractMethodDeclaration/varargs"/>
>- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//AbstractMethodDeclaration/qualifiedName"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodDeclaration/body"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodDeclaration/parameters"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodDeclaration/thrownExceptions"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodDeclaration/typeParameters"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodDeclaration/usagesInDocComments"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodDeclaration/usages"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/AbstractMethodDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodDeclaration/body"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodDeclaration/parameters"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodDeclaration/thrownExceptions"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodDeclaration/typeParameters"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodDeclaration/usagesInDocComments"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodDeclaration/usages"/>
>+ </genClasses>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/AbstractMethodInvocation">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodInvocation/method"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodInvocation/arguments"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractMethodInvocation/typeArguments"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//AbstractMethodInvocation">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodInvocation/method"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodInvocation/arguments"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractMethodInvocation/typeArguments"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/AbstractTypeDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractTypeDeclaration/bodyDeclarations"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractTypeDeclaration/commentsBeforeBody"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractTypeDeclaration/commentsAfterBody"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/AbstractTypeDeclaration/package"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractTypeDeclaration/superInterfaces"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//AbstractTypeDeclaration">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//AbstractTypeDeclaration/qualifiedName"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractTypeDeclaration/bodyDeclarations"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractTypeDeclaration/commentsBeforeBody"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractTypeDeclaration/commentsAfterBody"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//AbstractTypeDeclaration/package"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractTypeDeclaration/superInterfaces"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/AbstractTypeQualifiedExpression">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractTypeQualifiedExpression/qualifier"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//AbstractTypeQualifiedExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractTypeQualifiedExpression/qualifier"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/AbstractVariablesContainer">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractVariablesContainer/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AbstractVariablesContainer/fragments"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//AbstractVariablesContainer">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractVariablesContainer/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AbstractVariablesContainer/fragments"/>
>+ <genClasses ecoreClass="java.ecore#/0/Annotation">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Annotation/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Annotation/values"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//Annotation">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Annotation/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Annotation/values"/>
>+ <genClasses ecoreClass="java.ecore#/0/Archive">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Archive/originalFilePath"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Archive/classFiles"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Archive/manifest"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//AssertStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AssertStatement/message"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AssertStatement/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/AssertStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AssertStatement/message"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AssertStatement/expression"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//ASTNode">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ASTNode/comments"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//ASTNode/originalCompilationUnit"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/ASTNode">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ASTNode/comments"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ASTNode/originalCompilationUnit"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ASTNode/originalClassFile"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//AnnotationMemberValuePair">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//AnnotationMemberValuePair/member"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AnnotationMemberValuePair/value"/>
>+ <genClasses ecoreClass="java.ecore#/0/AnnotationMemberValuePair">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/AnnotationMemberValuePair/member"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AnnotationMemberValuePair/value"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//AnnotationTypeDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//AnnotationTypeMemberDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AnnotationTypeMemberDeclaration/default"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AnnotationTypeMemberDeclaration/type"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//AnnotationTypeMemberDeclaration/usages"/>
>+ <genClasses ecoreClass="java.ecore#/0/AnnotationTypeDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/AnnotationTypeMemberDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AnnotationTypeMemberDeclaration/default"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AnnotationTypeMemberDeclaration/type"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/AnnotationTypeMemberDeclaration/usages"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//AnonymousClassDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//AnonymousClassDeclaration/bodyDeclarations"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//AnonymousClassDeclaration/classInstanceCreation"/>
>+ <genClasses ecoreClass="java.ecore#/0/AnonymousClassDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/AnonymousClassDeclaration/bodyDeclarations"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/AnonymousClassDeclaration/classInstanceCreation"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ArrayAccess">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayAccess/array"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayAccess/index"/>
>+ <genClasses ecoreClass="java.ecore#/0/ArrayAccess">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayAccess/array"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayAccess/index"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ArrayCreation">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayCreation/dimensions"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayCreation/initializer"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayCreation/type"/>
>+ <genClasses ecoreClass="java.ecore#/0/ArrayCreation">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayCreation/dimensions"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayCreation/initializer"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayCreation/type"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ArrayInitializer">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayInitializer/expressions"/>
>+ <genClasses ecoreClass="java.ecore#/0/ArrayInitializer">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayInitializer/expressions"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ArrayLengthAccess">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayLengthAccess/array"/>
>+ <genClasses ecoreClass="java.ecore#/0/ArrayLengthAccess">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayLengthAccess/array"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ArrayType">
>- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//ArrayType/qualifiedName"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//ArrayType/dimensions"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ArrayType/elementType"/>
>+ <genClasses ecoreClass="java.ecore#/0/ArrayType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/ArrayType/dimensions"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ArrayType/elementType"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//Assignment">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Assignment/leftHandSide"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Assignment/operator"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Assignment/rightHandSide"/>
>+ <genClasses ecoreClass="java.ecore#/0/Assignment">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Assignment/leftHandSide"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Assignment/operator"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Assignment/rightHandSide"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//BodyDeclaration">
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//BodyDeclaration/abstractTypeDeclaration"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//BodyDeclaration/annotations"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//BodyDeclaration/anonymousClassDeclarationOwner"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//BodyDeclaration/modifier"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/BodyDeclaration">
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/BodyDeclaration/abstractTypeDeclaration"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/BodyDeclaration/annotations"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/BodyDeclaration/anonymousClassDeclarationOwner"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/BodyDeclaration/modifier"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//BooleanLiteral">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//BooleanLiteral/value"/>
>+ <genClasses ecoreClass="java.ecore#/0/BooleanLiteral">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/BooleanLiteral/value"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//BlockComment"/>
>- <genClasses ecoreClass="java.ecore#//Block">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Block/statements"/>
>+ <genClasses ecoreClass="java.ecore#/0/BlockComment"/>
>+ <genClasses ecoreClass="java.ecore#/0/Block">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Block/statements"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//BreakStatement">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//BreakStatement/label"/>
>+ <genClasses ecoreClass="java.ecore#/0/BreakStatement">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/BreakStatement/label"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//CastExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//CastExpression/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//CastExpression/type"/>
>+ <genClasses ecoreClass="java.ecore#/0/CastExpression">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/CastExpression/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/CastExpression/type"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//CatchClause">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//CatchClause/exception"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//CatchClause/body"/>
>+ <genClasses ecoreClass="java.ecore#/0/CatchClause">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/CatchClause/exception"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/CatchClause/body"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//CharacterLiteral">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//CharacterLiteral/escapedValue"/>
>+ <genClasses ecoreClass="java.ecore#/0/CharacterLiteral">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/CharacterLiteral/escapedValue"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ClassInstanceCreation">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ClassInstanceCreation/anonymousClassDeclaration"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ClassInstanceCreation/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ClassInstanceCreation/type"/>
>+ <genClasses ecoreClass="java.ecore#/0/ClassFile">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/ClassFile/originalFilePath"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassFile/type"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassFile/attachedSource"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassFile/package"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ConstructorDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//ConditionalExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ConditionalExpression/elseExpression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ConditionalExpression/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ConditionalExpression/thenExpression"/>
>+ <genClasses ecoreClass="java.ecore#/0/ClassInstanceCreation">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassInstanceCreation/anonymousClassDeclaration"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassInstanceCreation/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassInstanceCreation/type"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ConstructorInvocation"/>
>- <genClasses ecoreClass="java.ecore#//ClassDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ClassDeclaration/superClass"/>
>+ <genClasses ecoreClass="java.ecore#/0/ConstructorDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/ConditionalExpression">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ConditionalExpression/elseExpression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ConditionalExpression/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ConditionalExpression/thenExpression"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//Comment">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Comment/content"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Comment/enclosedByParent"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Comment/prefixOfParent"/>
>+ <genClasses ecoreClass="java.ecore#/0/ConstructorInvocation"/>
>+ <genClasses ecoreClass="java.ecore#/0/ClassDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ClassDeclaration/superClass"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//CompilationUnit">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//CompilationUnit/originalFilePath"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//CompilationUnit/commentList"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//CompilationUnit/imports"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//CompilationUnit/package"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//CompilationUnit/types"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/Comment">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Comment/content"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Comment/enclosedByParent"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Comment/prefixOfParent"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ContinueStatement">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//ContinueStatement/label"/>
>+ <genClasses ecoreClass="java.ecore#/0/CompilationUnit">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/CompilationUnit/originalFilePath"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/CompilationUnit/commentList"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/CompilationUnit/imports"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/CompilationUnit/package"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/CompilationUnit/types"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//DoStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//DoStatement/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//DoStatement/body"/>
>+ <genClasses ecoreClass="java.ecore#/0/ContinueStatement">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ContinueStatement/label"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//EmptyStatement"/>
>- <genClasses ecoreClass="java.ecore#//EnhancedForStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//EnhancedForStatement/body"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//EnhancedForStatement/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//EnhancedForStatement/parameter"/>
>+ <genClasses ecoreClass="java.ecore#/0/DoStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/DoStatement/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/DoStatement/body"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//EnumConstantDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//EnumConstantDeclaration/anonymousClassDeclaration"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//EnumConstantDeclaration/arguments"/>
>+ <genClasses ecoreClass="java.ecore#/0/EmptyStatement"/>
>+ <genClasses ecoreClass="java.ecore#/0/EnhancedForStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/EnhancedForStatement/body"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/EnhancedForStatement/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/EnhancedForStatement/parameter"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//EnumDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//EnumDeclaration/enumConstants"/>
>+ <genClasses ecoreClass="java.ecore#/0/EnumConstantDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/EnumConstantDeclaration/anonymousClassDeclaration"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/EnumConstantDeclaration/arguments"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//Expression"/>
>- <genClasses ecoreClass="java.ecore#//ExpressionStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ExpressionStatement/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/EnumDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/EnumDeclaration/enumConstants"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//FieldAccess">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//FieldAccess/field"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//FieldAccess/expression"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/Expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/ExpressionStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ExpressionStatement/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//FieldDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//ForStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ForStatement/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ForStatement/updaters"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ForStatement/initializers"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ForStatement/body"/>
>+ <genClasses ecoreClass="java.ecore#/0/FieldAccess">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/FieldAccess/field"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/FieldAccess/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//IfStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//IfStatement/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//IfStatement/thenStatement"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//IfStatement/elseStatement"/>
>+ <genClasses ecoreClass="java.ecore#/0/FieldDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/ForStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ForStatement/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ForStatement/updaters"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ForStatement/initializers"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ForStatement/body"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ImportDeclaration">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//ImportDeclaration/static"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//ImportDeclaration/importedElement"/>
>+ <genClasses ecoreClass="java.ecore#/0/IfStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/IfStatement/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/IfStatement/thenStatement"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/IfStatement/elseStatement"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//InfixExpression">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//InfixExpression/operator"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//InfixExpression/rightOperand"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//InfixExpression/leftOperand"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//InfixExpression/extendedOperands"/>
>+ <genClasses ecoreClass="java.ecore#/0/ImportDeclaration">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/ImportDeclaration/static"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/ImportDeclaration/importedElement"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//Initializer">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Initializer/body"/>
>+ <genClasses ecoreClass="java.ecore#/0/InfixExpression">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/InfixExpression/operator"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/InfixExpression/rightOperand"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/InfixExpression/leftOperand"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/InfixExpression/extendedOperands"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//InstanceofExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//InstanceofExpression/rightOperand"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//InstanceofExpression/leftOperand"/>
>+ <genClasses ecoreClass="java.ecore#/0/Initializer">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Initializer/body"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//InterfaceDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//Javadoc">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Javadoc/tags"/>
>+ <genClasses ecoreClass="java.ecore#/0/InstanceofExpression">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/InstanceofExpression/rightOperand"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/InstanceofExpression/leftOperand"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//LabeledStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//LabeledStatement/body"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//LabeledStatement/usagesInBreakStatements"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//LabeledStatement/usagesInContinueStatements"/>
>+ <genClasses ecoreClass="java.ecore#/0/InterfaceDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/Javadoc">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Javadoc/tags"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//LineComment"/>
>- <genClasses ecoreClass="java.ecore#//MemberRef">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//MemberRef/member"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//MemberRef/qualifier"/>
>+ <genClasses ecoreClass="java.ecore#/0/LabeledStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/LabeledStatement/body"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/LabeledStatement/usagesInBreakStatements"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/LabeledStatement/usagesInContinueStatements"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//MethodDeclaration">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//MethodDeclaration/extraArrayDimensions"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//MethodDeclaration/returnType"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//MethodDeclaration/redefinedMethodDeclaration"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//MethodDeclaration/redefinitions"/>
>+ <genClasses ecoreClass="java.ecore#/0/LineComment"/>
>+ <genClasses ecoreClass="java.ecore#/0/Manifest">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Manifest/mainAttributes"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Manifest/entryAttributes"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//MethodInvocation">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//MethodInvocation/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/ManifestAttribute">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/ManifestAttribute/key"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/ManifestAttribute/value"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//MethodRef">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//MethodRef/method"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//MethodRef/qualifier"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//MethodRef/parameters"/>
>+ <genClasses ecoreClass="java.ecore#/0/ManifestEntry">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/ManifestEntry/name"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ManifestEntry/attributes"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//MethodRefParameter">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//MethodRefParameter/name"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//MethodRefParameter/varargs"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//MethodRefParameter/type"/>
>+ <genClasses ecoreClass="java.ecore#/0/MemberRef">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/MemberRef/member"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/MemberRef/qualifier"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//Model">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Model/name"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Model/ownedElements"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Model/orphanTypes"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Model/unresolvedItems"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Model/compilationUnits"/>
>+ <genClasses ecoreClass="java.ecore#/0/MethodDeclaration">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/MethodDeclaration/extraArrayDimensions"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodDeclaration/returnType"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodDeclaration/redefinedMethodDeclaration"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodDeclaration/redefinitions"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//Modifier">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/visibility"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/inheritance"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/static"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/transient"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/volatile"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/native"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/strictfp"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Modifier/synchronized"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Modifier/bodyDeclaration"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Modifier/singleVariableDeclaration"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Modifier/variableDeclarationStatement"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Modifier/variableDeclarationExpression"/>
>+ <genClasses ecoreClass="java.ecore#/0/MethodInvocation">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodInvocation/expression"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//NamedElement">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//NamedElement/name"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//NamedElement/proxy"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//NamedElement/usagesInImports"/>
>+ <genClasses ecoreClass="java.ecore#/0/MethodRef">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodRef/method"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodRef/qualifier"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodRef/parameters"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//NumberLiteral">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//NumberLiteral/tokenValue"/>
>+ <genClasses ecoreClass="java.ecore#/0/MethodRefParameter">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/MethodRefParameter/name"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/MethodRefParameter/varargs"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/MethodRefParameter/type"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//NullLiteral"/>
>- <genClasses ecoreClass="java.ecore#//Package">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//Package/qualifiedName"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Package/ownedElements"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Package/model"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//Package/ownedPackages"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//Package/package"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//Package/usagesInPackageAccess"/>
>+ <genClasses ecoreClass="java.ecore#/0/Model">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Model/name"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Model/ownedElements"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Model/orphanTypes"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Model/unresolvedItems"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Model/compilationUnits"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Model/classFiles"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Model/archives"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//PackageAccess">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//PackageAccess/package"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//PackageAccess/qualifier"/>
>+ <genClasses ecoreClass="java.ecore#/0/Modifier">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/visibility"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/inheritance"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/static"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/transient"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/volatile"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/native"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/strictfp"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/Modifier/synchronized"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/Modifier/bodyDeclaration"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/Modifier/singleVariableDeclaration"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/Modifier/variableDeclarationStatement"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/Modifier/variableDeclarationExpression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ParameterizedType">
>- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//ParameterizedType/qualifiedName"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ParameterizedType/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ParameterizedType/typeArguments"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/NamedElement">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/NamedElement/name"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/NamedElement/proxy"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/NamedElement/usagesInImports"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ParenthesizedExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ParenthesizedExpression/expression"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/NamespaceAccess"/>
>+ <genClasses ecoreClass="java.ecore#/0/NumberLiteral">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/NumberLiteral/tokenValue"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//PostfixExpression">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//PostfixExpression/operator"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//PostfixExpression/operand"/>
>+ <genClasses ecoreClass="java.ecore#/0/NullLiteral"/>
>+ <genClasses ecoreClass="java.ecore#/0/Package">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Package/ownedElements"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/Package/model"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/Package/ownedPackages"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/Package/package"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/Package/usagesInPackageAccess"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//PrefixExpression">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//PrefixExpression/operator"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//PrefixExpression/operand"/>
>+ <genClasses ecoreClass="java.ecore#/0/PackageAccess">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/PackageAccess/package"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/PackageAccess/qualifier"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//PrimitiveType"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeBoolean"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeByte"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeChar"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeDouble"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeShort"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeFloat"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeInt"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeLong"/>
>- <genClasses ecoreClass="java.ecore#//PrimitiveTypeVoid"/>
>- <genClasses ecoreClass="java.ecore#//ReturnStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ReturnStatement/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/ParameterizedType">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ParameterizedType/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ParameterizedType/typeArguments"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SingleVariableAccess">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//SingleVariableAccess/variable"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SingleVariableAccess/qualifier"/>
>+ <genClasses ecoreClass="java.ecore#/0/ParenthesizedExpression">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ParenthesizedExpression/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SingleVariableDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SingleVariableDeclaration/modifier"/>
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//SingleVariableDeclaration/varargs"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SingleVariableDeclaration/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SingleVariableDeclaration/annotations"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//SingleVariableDeclaration/methodDeclaration"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//SingleVariableDeclaration/catchClause"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//SingleVariableDeclaration/enhancedForStatement"/>
>+ <genClasses ecoreClass="java.ecore#/0/PostfixExpression">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/PostfixExpression/operator"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/PostfixExpression/operand"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//Statement"/>
>- <genClasses ecoreClass="java.ecore#//StringLiteral">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//StringLiteral/escapedValue"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrefixExpression">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/PrefixExpression/operator"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/PrefixExpression/operand"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SuperConstructorInvocation">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SuperConstructorInvocation/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveType"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeBoolean"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeByte"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeChar"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeDouble"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeShort"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeFloat"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeInt"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeLong"/>
>+ <genClasses ecoreClass="java.ecore#/0/PrimitiveTypeVoid"/>
>+ <genClasses ecoreClass="java.ecore#/0/ReturnStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ReturnStatement/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SuperFieldAccess">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SuperFieldAccess/field"/>
>+ <genClasses ecoreClass="java.ecore#/0/SingleVariableAccess">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableAccess/variable"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableAccess/qualifier"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SuperMethodInvocation"/>
>- <genClasses ecoreClass="java.ecore#//SwitchCase">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//SwitchCase/default"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SwitchCase/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/SingleVariableDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableDeclaration/modifier"/>
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/SingleVariableDeclaration/varargs"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableDeclaration/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableDeclaration/annotations"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableDeclaration/methodDeclaration"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableDeclaration/catchClause"/>
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/SingleVariableDeclaration/enhancedForStatement"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SwitchStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SwitchStatement/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SwitchStatement/statements"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/Statement"/>
>+ <genClasses ecoreClass="java.ecore#/0/StringLiteral">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/StringLiteral/escapedValue"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//SynchronizedStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SynchronizedStatement/body"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//SynchronizedStatement/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/SuperConstructorInvocation">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SuperConstructorInvocation/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TagElement">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//TagElement/tagName"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TagElement/fragments"/>
>+ <genClasses ecoreClass="java.ecore#/0/SuperFieldAccess">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SuperFieldAccess/field"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TextElement">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//TextElement/text"/>
>+ <genClasses ecoreClass="java.ecore#/0/SuperMethodInvocation"/>
>+ <genClasses ecoreClass="java.ecore#/0/SwitchCase">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/SwitchCase/default"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SwitchCase/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//ThisExpression"/>
>- <genClasses ecoreClass="java.ecore#//ThrowStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//ThrowStatement/expression"/>
>+ <genClasses ecoreClass="java.ecore#/0/SwitchStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SwitchStatement/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SwitchStatement/statements"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TryStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TryStatement/body"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TryStatement/finally"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TryStatement/catchClauses"/>
>+ <genClasses ecoreClass="java.ecore#/0/SynchronizedStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SynchronizedStatement/body"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/SynchronizedStatement/expression"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//Type">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//Type/usagesInTypeAccess"/>
>+ <genClasses ecoreClass="java.ecore#/0/TagElement">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/TagElement/tagName"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TagElement/fragments"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TypeAccess">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//TypeAccess/type"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TypeAccess/qualifier"/>
>+ <genClasses ecoreClass="java.ecore#/0/TextElement">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/TextElement/text"/>
> </genClasses>
>- <genClasses image="false" ecoreClass="java.ecore#//TypeDeclaration">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TypeDeclaration/typeParameters"/>
>+ <genClasses ecoreClass="java.ecore#/0/ThisExpression"/>
>+ <genClasses ecoreClass="java.ecore#/0/ThrowStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/ThrowStatement/expression"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TypeDeclarationStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TypeDeclarationStatement/declaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/TryStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TryStatement/body"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TryStatement/finally"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TryStatement/catchClauses"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TypeLiteral">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TypeLiteral/type"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/Type">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/Type/usagesInTypeAccess"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//TypeParameter">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//TypeParameter/bounds"/>
>+ <genClasses ecoreClass="java.ecore#/0/TypeAccess">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/TypeAccess/type"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TypeAccess/qualifier"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//UnresolvedItem"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedItemAccess">
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//UnresolvedItemAccess/element"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//UnresolvedItemAccess/qualifier"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/TypeDeclaration">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TypeDeclaration/typeParameters"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//UnresolvedAnnotationDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedAnnotationTypeMemberDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedClassDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedEnumDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedInterfaceDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedLabeledStatement"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedMethodDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedSingleVariableDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedType"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedTypeDeclaration"/>
>- <genClasses ecoreClass="java.ecore#//UnresolvedVariableDeclarationFragment"/>
>- <genClasses image="false" ecoreClass="java.ecore#//VariableDeclaration">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//VariableDeclaration/extraArrayDimensions"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//VariableDeclaration/initializer"/>
>- <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#//VariableDeclaration/usageInVariableAccess"/>
>+ <genClasses ecoreClass="java.ecore#/0/TypeDeclarationStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TypeDeclarationStatement/declaration"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//VariableDeclarationExpression">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//VariableDeclarationExpression/modifier"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//VariableDeclarationExpression/annotations"/>
>+ <genClasses ecoreClass="java.ecore#/0/TypeLiteral">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TypeLiteral/type"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//VariableDeclarationFragment">
>- <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//VariableDeclarationFragment/qualifiedName"/>
>- <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#//VariableDeclarationFragment/variablesContainer"/>
>+ <genClasses ecoreClass="java.ecore#/0/TypeParameter">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/TypeParameter/bounds"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//VariableDeclarationStatement">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//VariableDeclarationStatement/extraArrayDimensions"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//VariableDeclarationStatement/modifier"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//VariableDeclarationStatement/annotations"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedItem"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedItemAccess">
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/UnresolvedItemAccess/element"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/UnresolvedItemAccess/qualifier"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//WildCardType">
>- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#//WildCardType/upperBound"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//WildCardType/bound"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedAnnotationDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedAnnotationTypeMemberDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedClassDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedEnumDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedInterfaceDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedLabeledStatement"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedMethodDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedSingleVariableDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedType"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedTypeDeclaration"/>
>+ <genClasses ecoreClass="java.ecore#/0/UnresolvedVariableDeclarationFragment"/>
>+ <genClasses image="false" ecoreClass="java.ecore#/0/VariableDeclaration">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/VariableDeclaration/extraArrayDimensions"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclaration/initializer"/>
>+ <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclaration/usageInVariableAccess"/>
> </genClasses>
>- <genClasses ecoreClass="java.ecore#//WhileStatement">
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//WhileStatement/expression"/>
>- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#//WhileStatement/body"/>
>+ <genClasses ecoreClass="java.ecore#/0/VariableDeclarationExpression">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclarationExpression/modifier"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclarationExpression/annotations"/>
>+ </genClasses>
>+ <genClasses ecoreClass="java.ecore#/0/VariableDeclarationFragment">
>+ <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclarationFragment/variablesContainer"/>
>+ </genClasses>
>+ <genClasses ecoreClass="java.ecore#/0/VariableDeclarationStatement">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/VariableDeclarationStatement/extraArrayDimensions"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclarationStatement/modifier"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/VariableDeclarationStatement/annotations"/>
>+ </genClasses>
>+ <genClasses ecoreClass="java.ecore#/0/WildCardType">
>+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute java.ecore#/0/WildCardType/upperBound"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/WildCardType/bound"/>
>+ </genClasses>
>+ <genClasses ecoreClass="java.ecore#/0/WhileStatement">
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/WhileStatement/expression"/>
>+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference java.ecore#/0/WhileStatement/body"/>
> </genClasses>
> </genPackages>
> </genmodel:GenModel>

Flags:

fabien.giquel: iplog+

Actions: View | Diff

Attachments on bug 295628: 152616