Merge remote-tracking branch 'origin/maintenance-1.0' intomaintenance-1.1

maintenance-1.1

Conflicts:
	org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java

Change-Id: Ic397081cb0929c62a6ebf9132f509f363e010fac

5697 files changed, 3093 insertions, 2816 deletions

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.custom.core/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java
index 6789acc7c..b4c25f20a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/Activator.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.core;

@@ -40,7 +40,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -53,7 +53,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -66,7 +66,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java
index 44d854733..adc4b9bb0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsCatalog.java
@@ -134,7 +134,7 @@ public class CustomizationsCatalog extends AbstractMoDiscoCatalog {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.gmt.modisco.infra.common.core.builder.AbstractMoDiscoCatalog#

 	 * getActivator()

@@ -276,7 +276,7 @@ public class CustomizationsCatalog extends AbstractMoDiscoCatalog {
 

 	/**

 	 * This method returns the customization with the given name.

-	 * 

+	 *

 	 * @param name

 	 *            the name of a resource contained in the catalog

 	 * @return return a customization

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java
index 48dd6095d..ca36122ed 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/src/org/eclipse/gmt/modisco/infra/browser/custom/core/CustomizationsRegistry.java
@@ -21,7 +21,7 @@ import java.util.List;
 @Deprecated

 public final class CustomizationsRegistry {

 

-	

+

 

 	private static CustomizationsRegistry instance = null;

 

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.editor/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.custom.editor/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.editor/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.editor/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/Activator.java b/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/Activator.java
index 03ffaedd7..d2783ee72 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/Activator.java
@@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -48,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -61,7 +61,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/editors/CustomizationEditor.java b/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/editors/CustomizationEditor.java
index 7e4b0b68a..337f2ce5e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/editors/CustomizationEditor.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.editor/src/org/eclipse/gmt/modisco/infra/browser/custom/editor/editors/CustomizationEditor.java
@@ -512,7 +512,7 @@ public class CustomizationEditor extends EditorPart implements IGotoMarker {
 	/**

 	 * Opens a message box to ask the user whether to keep customizations for the old metamodels, or

 	 * clean the customizations.

-	 * 

+	 *

 	 * @param newMetamodel

 	 */

 	private void promptToCleanCustomization(final Resource newMetamodel) {

@@ -1737,7 +1737,7 @@ public class CustomizationEditor extends EditorPart implements IGotoMarker {
 

 	/**

 	 * Clean the custom view

-	 * 

+	 *

 	 * @return whether the custom view contains information and thus must be kept

 	 */

 	private boolean clean(final CustomView customView) {

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/src/org/eclipse/gmt/modisco/infra/browser/custom/examples/java/jdk/IsPlugin.java b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/src/org/eclipse/gmt/modisco/infra/browser/custom/examples/java/jdk/IsPlugin.java
index c0f85a1c7..05b4a8cca 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/src/org/eclipse/gmt/modisco/infra/browser/custom/examples/java/jdk/IsPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/src/org/eclipse/gmt/modisco/infra/browser/custom/examples/java/jdk/IsPlugin.java
@@ -25,5 +25,5 @@ public class IsPlugin implements IJavaModelQuery<TypeDeclaration, Boolean> {
 				"org.eclipse.core.runtime.Plugin"); //$NON-NLS-1$

 		return new Boolean(Utils.isKindOf(context, collectionInterface));

 	}

-	

+

 }

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.custom.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java
index afebc9316..43da119f1 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/Activator.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.ui;

@@ -42,7 +42,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -55,7 +55,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -68,7 +68,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java
index 5ba1ac542..fbfb5a9ac 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/controls/QuerySetsSelectionControl.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.ui.controls;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/views/CustomizationsView.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/views/CustomizationsView.java
index 0009b2fb1..1f8ecd6f0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/views/CustomizationsView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/views/CustomizationsView.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.ui.views;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationFilePage.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationFilePage.java
index 30dc8fd1d..719b8c030 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationFilePage.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationFilePage.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.ui.wizards;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationWizard.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationWizard.java
index 32e3c6445..9d2483637 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationWizard.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/NewCustomizationWizard.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.ui.wizards;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/SelectQuerySetsPage.java b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/SelectQuerySetsPage.java
index 363fb359e..c11c16bf0 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/SelectQuerySetsPage.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/src/org/eclipse/gmt/modisco/infra/browser/custom/ui/wizards/SelectQuerySetsPage.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.custom.ui.wizards;

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.custom/.checkstyle
index a1adbaab1..21e2e9691 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/.checkstyle
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/browser/custom"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/browser/custom/emf"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/.classpath b/org.eclipse.gmt.modisco.infra.browser.custom/.classpath
index 45f024e85..afb9bb46e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/.classpath
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/build.properties b/org.eclipse.gmt.modisco.infra.browser.custom/build.properties
index 2952a1659..0619f8a95 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/build.properties
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #     Nicolas Bros (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                META-INF/,\

@@ -15,7 +16,8 @@ bin.includes = .,\
                models/,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/,\

+           src/

 output.. = bin/

 src.includes = models/,\

                about.html

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/models/uiCustom.genmodel b/org.eclipse.gmt.modisco.infra.browser.custom/models/uiCustom.genmodel
index bf1930bc5..fc285c44c 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/models/uiCustom.genmodel
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/models/uiCustom.genmodel
@@ -1,8 +1,8 @@
 <?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="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;    Nicolas Bros (Mia-Software) - initial API and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.gmt.modisco.infra.browser.custom/src" editDirectory="/org.eclipse.gmt.modisco.infra.browser.custom.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;    Nicolas Bros (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.gmt.modisco.infra.browser.custom/src-gen" editDirectory="/org.eclipse.gmt.modisco.infra.browser.custom.edit/src"

     editorDirectory="/org.eclipse.gmt.modisco.infra.browser.custom.editor/src" modelPluginID="org.eclipse.gmt.modisco.infra.browser.custom"

     templateDirectory="" modelName="UiCustom" editPluginClass="org.eclipse.gmt.modisco.infra.browser.custom.emf.provider.UiCustomEditPlugin"

     editorPluginClass="org.eclipse.gmt.modisco.infra.browser.custom.emf.presentation.UiCustomEditorPlugin"

diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java
index 3ed8cd75c..3ed8cd75c 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/AttributeView.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java
index c597b6a6f..c597b6a6f 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/CustomView.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java
index cee87a088..cee87a088 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/CustomViewFeature.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java
index 56c8dcd79..56c8dcd79 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/CustomizableFeatures.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java
index 0938ba076..0938ba076 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/DerivedFeatureValue.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java
index 4bc04868e..4bc04868e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValue.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java
index 4ac1692dd..4ac1692dd 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/FeatureValueCase.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java
index 7efce2889..7efce2889 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/MetamodelView.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java
index e8062a960..e8062a960 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/ReferenceView.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java
index 76ba30080..76ba30080 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/StaticFeatureValue.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java
index 3f6b8a8a1..3f6b8a8a1 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/TypeView.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java
index 3f2127dd7..3f2127dd7 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java
index d71563e9e..d71563e9e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/UicustomPackage.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/AttributeViewImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/AttributeViewImpl.java
index bf06274af..bf06274af 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/AttributeViewImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/AttributeViewImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewFeatureImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewFeatureImpl.java
index 907050842..907050842 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewFeatureImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewFeatureImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewImpl.java
index 891f56310..891f56310 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/CustomViewImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/DerivedFeatureValueImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/DerivedFeatureValueImpl.java
index b6219efa4..b6219efa4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/DerivedFeatureValueImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/DerivedFeatureValueImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueCaseImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueCaseImpl.java
index 0521d6d32..0521d6d32 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueCaseImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueCaseImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueImpl.java
index d242f5691..d242f5691 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/FeatureValueImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/MetamodelViewImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/MetamodelViewImpl.java
index a50ef16f3..a50ef16f3 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/MetamodelViewImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/MetamodelViewImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/ReferenceViewImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/ReferenceViewImpl.java
index b328a6b1b..b328a6b1b 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/ReferenceViewImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/ReferenceViewImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/StaticFeatureValueImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/StaticFeatureValueImpl.java
index 4aa0c9ec5..4aa0c9ec5 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/StaticFeatureValueImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/StaticFeatureValueImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/TypeViewImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/TypeViewImpl.java
index 722d70938..722d70938 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/TypeViewImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/TypeViewImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomFactoryImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomFactoryImpl.java
index 1d409cb57..1d409cb57 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomPackageImpl.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomPackageImpl.java
index 7972a6042..7972a6042 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/impl/UicustomPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java
index 272a64e71..272a64e71 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java
index 5e74b4b21..5e74b4b21 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/src/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/src-gen/org/eclipse/gmt/modisco/infra/browser/custom/emf/util/UicustomSwitch.java
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java
index f583a8fcd..d82a465d4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/Activator.java
@@ -42,7 +42,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -55,7 +55,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -68,7 +68,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java
index db5747d6f..403c143c2 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/src/org/eclipse/gmt/modisco/infra/browser/uicore/examples/cnf/actions/OpenAction.java
@@ -41,7 +41,7 @@ public class OpenAction extends Action {
 

 	/**

 	 * Construct the OpenAction with the given page.

-	 * 

+	 *

 	 * @param page

 	 *            the page to use as context to open the editor.

 	 * @param selectionProvider

@@ -55,7 +55,7 @@ public class OpenAction extends Action {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.jface.action.Action#isEnabled()

 	 */

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/.checkstyle b/org.eclipse.gmt.modisco.infra.browser.uicore/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java
index 0dc392214..c3db23754 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizableModelLabelProvider.java
@@ -27,7 +27,7 @@ import org.eclipse.swt.graphics.Image;
 @Deprecated

 public class CustomizableModelLabelProvider extends LabelProvider implements IColorProvider,

 		IFontProvider {

-	

+

 	/* Will likely be useful in the future */

 	@SuppressWarnings("unused")

 	private final CustomizationManager customizationManager;

@@ -35,7 +35,7 @@ public class CustomizableModelLabelProvider extends LabelProvider implements ICo
 	public CustomizableModelLabelProvider(final CustomizationManager customizationManager) {

 		this.customizationManager = customizationManager;

 	}

-	

+

 	@Override

 	public String getText(final Object element) {

 		final String prefix;

@@ -54,7 +54,7 @@ public class CustomizableModelLabelProvider extends LabelProvider implements ICo
 		return prefix + element.toString();

 

 	}

-	

+

 	@Override

 	public Image getImage(final Object element) {

 		if (element instanceof ITreeElement) {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java
index 307c55ad6..508e09724 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/CustomizationManager.java
@@ -61,7 +61,7 @@ public class CustomizationManager {
 	 * effectively load the registered customizations.

 	 * <p>

 	 * Customizations should be retrieved from the {@link CustomizationsCatalog}.

-	 * 

+	 *

 	 * @param customization

 	 *            a customization root object, defined from metamodel

 	 *            "http://www.eclipse.org/MoDisco/infra/browser/custom/0.8".

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java
index 4cc9bfbfd..413221d26 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/UnwrappingSelectionProvider.java
@@ -33,16 +33,16 @@ import org.eclipse.jface.viewers.StructuredSelection;
  * {@link org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider}, from which this class is
  * derived).
  * </ul>
- * 
+ *
  * <p>
  * You can use this {@link ISelectionProvider selection provider} to register a context menu on a
  * viewer created using the {@link CustomizableModelContentProvider}, so that the menu actions will
  * get the Ecore versions of the elements as the selection:
- * 
+ *
  * <pre>
  * getSite().registerContextMenu(MENU_ID, contextMenu, new UnwrappingSelectionProvider(treeViewer));
  * </pre>
- * 
+ *
  * @deprecated Will be replaced by EMF Facet,
  *             cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=470715
  */
@@ -63,7 +63,7 @@ public class UnwrappingSelectionProvider extends
 
 	/**
 	 * Replace proxy objects by their underlying Ecore objects in the given selection
-	 * 
+	 *
 	 * @return the unwrapped version of the selection
 	 */
 	public static ISelection unwrapSelection(final ISelection selection) {
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java
index 8d4c9dbcf..6d3ac3ae3 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/FilteredIconProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.extensions.icons;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java
index 233e984d7..fb51a3296 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/icons/IconProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.extensions.icons;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java
index c7b2bd2c1..99df9e048 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/AbstractNameProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.extensions.naming;

@@ -31,7 +31,7 @@ public abstract class AbstractNameProvider implements NameProvider {
 

 	/**

 	 * Find a default name for the given {@link EObject}.

-	 * 

+	 *

 	 * @return a name based on a 'name' attribute or a string attribute, or an

 	 *         empty string if none was found

 	 */

@@ -49,7 +49,7 @@ public abstract class AbstractNameProvider implements NameProvider {
 	/**

 	 * Find a feature which can be used as a name for instances of the given

 	 * {@link EClass}.

-	 * 

+	 *

 	 * @return a feature corresponding to a 'name' attribute or a string

 	 *         attribute, or <code>null</code> if none was found

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java
index 1108f4580..28bd69eff 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/FilteredNameProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.extensions.naming;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java
index 9cbb247bb..6f3ddaeb8 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/extensions/naming/NameProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.extensions.naming;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java
index 106b6241c..c1f68a01b 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/Activator.java
@@ -48,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java
index 9aec07922..66cd7659a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/customization/CustomizationEngine.java
@@ -548,7 +548,7 @@ public class CustomizationEngine {
 

 	/**

 	 * Add the given type view to the engine type views

-	 * 

+	 *

 	 * @param eClass

 	 *            the metaclass corresponding to the typeView

 	 * @param typeView

@@ -568,7 +568,7 @@ public class CustomizationEngine {
 		 * for each superclass with "applies to sub-instances" set to true, apply the superclass

 		 * features to this subclass (from most specific to most generic, to respect the order of

 		 * evaluation)

-		 * 

+		 *

 		 * So we have to reverse the order of super type hierarchy

 		 */

 		engineElementView.addFeatures(typeView);

@@ -855,14 +855,14 @@ public class CustomizationEngine {
 

 	/**

 	 * Get a customized icon for a type.

-	 * 

+	 *

 	 * @param context

 	 *            the context that is passed to condition queries (may be <code>null</code>)

 	 * @param eClass

 	 *            the {@link EClass} for which to get an icon (may not be the same as

 	 *            <code>context.eClass()</code>: can be a {@link Facet})

 	 * @return the customized icon for the given {@link EClass}

-	 * 

+	 *

 	 * @deprecated replaced by instanceIcon, metaclassIcon, stickerIcon (see Bug 328473)

 	 * */

 	@Deprecated

@@ -873,7 +873,7 @@ public class CustomizationEngine {
 

 	/**

 	 * Get a customized icon for an instance.

-	 * 

+	 *

 	 * @param context

 	 *            the context that is passed to condition queries (may be <code>null</code>)

 	 * @param eClass

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java
index d28c3b46b..c59976f9a 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/IconProvidersRegistry.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.extensions;

@@ -85,10 +85,10 @@ public class IconProvidersRegistry extends AbstractRegistry {
 	/**

 	 * Query the icon providers registry for an icon for the given

 	 * {@link EObject}.

-	 * 

+	 *

 	 * @param eObject

 	 *            the model instance whose icon is queried

-	 * 

+	 *

 	 * @return the icon or <code>null</code> if no icon was provided

 	 */

 	public Image getIcon(final EObject eObject) {

@@ -159,7 +159,7 @@ public class IconProvidersRegistry extends AbstractRegistry {
 	/**

 	 * Read an 'iconProvider' element, and adds the icon providers to the

 	 * registry.

-	 * 

+	 *

 	 * @param configurationElement

 	 *            the 'iconProvider' element

 	 * @param metamodelId

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java
index 0c11fc8cd..734a245a6 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/extensions/NameProvidersRegistry.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.extensions;

@@ -74,10 +74,10 @@ public class NameProvidersRegistry extends AbstractRegistry {
 	/**

 	 * Query the name providers registry for a name for the given

 	 * {@link EObject}.

-	 * 

+	 *

 	 * @param eObject

 	 *            the model instance whose name is queried

-	 * 

+	 *

 	 * @return the name or <code>null</code> if no name was provided

 	 */

 	public String getName(final EObject eObject) {

@@ -160,7 +160,7 @@ public class NameProvidersRegistry extends AbstractRegistry {
 	/**

 	 * Read a 'nameProvider' element, and adds the name providers to the

 	 * registry.

-	 * 

+	 *

 	 * @param configurationElement

 	 *            the 'nameProvider' element

 	 * @param metamodelId

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java
index 17e51d42a..34ed2384b 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/AttributeItem.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

@@ -54,7 +54,7 @@ public class AttributeItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Instantiate a new {@link AttributeItem}.

-	 * 

+	 *

 	 * @param parent

 	 *            the model element that has this attribute

 	 * @param treeParent

@@ -156,7 +156,7 @@ public class AttributeItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Get a text describing the given attribute

-	 * 

+	 *

 	 * @param attribute

 	 *            the attribute to describe

 	 * @param showMultiplicity

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java
index 83d4de497..b224cb260 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ContainerLink.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

@@ -151,7 +151,7 @@ public class ContainerLink implements ITreeElement {
 		}

 		return parentHashCode;

 	}

-	

+

 	@Override

 	public String toString() {

 		return ContainerLink.class.getSimpleName() + "(" + getText() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java
index 2b91e5dcc..fc9c32a9c 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ITreeElement.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java
index 9a7905020..e636972fe 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/LinkItem.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

@@ -59,7 +59,7 @@ public class LinkItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Instantiate a new LinkItem.

-	 * 

+	 *

 	 * @param parent

 	 *            the model element that owns the link

 	 * @param reference

@@ -105,7 +105,7 @@ public class LinkItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Get a text describing the given reference

-	 * 

+	 *

 	 * @param reference

 	 *            the reference to describe

 	 * @param showMultiplicity

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java
index 4fe267291..2e1a18e35 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/ModelElementItem.java
@@ -183,7 +183,7 @@ public class ModelElementItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Override this method to add more virtual elements.

-	 * 

+	 *

 	 * @param children

 	 *            can add more children to this list

 	 */

@@ -193,7 +193,7 @@ public class ModelElementItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Create attribute elements corresponding to model attributes for the given {@link EObject}

-	 * 

+	 *

 	 * @return the list of attributes elements created for representing the attributes visually in

 	 *         the model browser

 	 */

@@ -256,11 +256,11 @@ public class ModelElementItem implements ITreeElement, IAdaptable {
 

 	/**

 	 * Create the links corresponding to references for the given {@link EObject}

-	 * 

+	 *

 	 * @param elementsInCollapsedLinks

 	 *            elements that are under links that are set to 'collapsed' through a customization

 	 *            will be added to this list

-	 * 

+	 *

 	 * @return the list of links created for representing the references in the model browser

 	 */

 	private ArrayList<LinkItem> createLinks(final List<Object> elementsInCollapsedLinks) {

@@ -621,7 +621,7 @@ public class ModelElementItem implements ITreeElement, IAdaptable {
 	 * <li>an icon provided by a registered icon provider

 	 * <li>an icon provided by an adapter factory from the EMF registry

 	 * <ul>

-	 * 

+	 *

 	 * @return an icon for the element or <code>null</code> if no icon is provided

 	 */

 	public static Image getImageFor(final EObject eObject,

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java
index a97742c74..0673e9c66 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/OperationCanceledException.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java
index 81d959f0d..a2fdf420d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/model/URIAttribute.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.model;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java
index 27e252f9d..b99854363 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ColorProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.util;

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java
index 26540eb8e..de34bf75e 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/EMFUtil.java
@@ -65,7 +65,7 @@ public class EMFUtil {
 

 	/**

 	 * Search for instances of the given EClass

-	 * 

+	 *

 	 * @param eClass

 	 *            the EClass of the elements that are looked for

 	 * @param resource

@@ -86,7 +86,7 @@ public class EMFUtil {
 

 	/**

 	 * Find and return all the metaclasses of the given resource set.

-	 * 

+	 *

 	 * @return a list of all the metaclasses of elements contained in the resource set, and

 	 *         metaclasses in resources in which metaclasses of elements in the resource set have

 	 *         been found

@@ -221,7 +221,7 @@ public class EMFUtil {
 

 	/**

 	 * Find the most specific metaclass that is common to all of the given elements.

-	 * 

+	 *

 	 * @return the common metaclass or <code>null</code> if none was found

 	 */

 	public static EClass findCommonClass(final List<EObject> elements) {

@@ -277,7 +277,7 @@ public class EMFUtil {
 

 	/**

 	 * Try to resolve the given proxy.

-	 * 

+	 *

 	 * @return whether the proxy could be resolved

 	 */

 	public static boolean tryResolve(final EObject eObject) {

@@ -353,7 +353,7 @@ public class EMFUtil {
 

 	/**

 	 * Find the {@link EObject} with the given URI in the given {@link ResourceSet}

-	 * 

+	 *

 	 * @return the element or <code>null</code> if no element was found with this URI in the given

 	 *         {@link ResourceSet}

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java
index ac84cfb8f..22cef06fe 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/ImageProvider.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Guyomar (Mia-Software) - Code Synchronisation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.uicore.internal.util;

@@ -89,7 +89,7 @@ public final class ImageProvider {
 	private Image queryIcon = null;

 	private Image uiCustomIcon = null;

 	private Image uriIcon = null;

-	

+

 	private Image shortcutIcon = null;

 

 	private static final String LINK_ICON_PATH = "/icons/full/ctool16/link.gif"; //$NON-NLS-1$

@@ -138,10 +138,10 @@ public final class ImageProvider {
 	private static final String COLLAPSE_ALL_ICON_PATH = "/icons/full/ctool16/collapseall.gif"; //$NON-NLS-1$

 	private static final String SHORTCUT_ICON_PATH = "/icons/shortcut.png"; //$NON-NLS-1$

 	private static final String SYNCHRONIZE_CODE_SOURCE = "/icons/full/ctool16/synchronizeSourceCode.gif"; //$NON-NLS-1$

-	

+

 	/**

 	 * Create an image descriptor from a resource

-	 * 

+	 *

 	 * @param resourcePath

 	 *            the path of the resource (in the bundle)

 	 * @return the image descriptor

@@ -273,7 +273,7 @@ public final class ImageProvider {
 	public ImageDescriptor getShowDerivedLinksImageDescriptor() {

 		return createImageDescriptor(ImageProvider.SHOW_DERIVED_LINKS_ICON_PATH);

 	}

-	

+

 	/** Return the icon representing synchronizeSourceCode action */

 	public ImageDescriptor getSynchronizeSourceCodeDescriptor() {

 		return createImageDescriptor(ImageProvider.SYNCHRONIZE_CODE_SOURCE);

@@ -605,7 +605,7 @@ public final class ImageProvider {
 	public ImageDescriptor getCollapseAllDescriptor() {

 		return createImageDescriptor(ImageProvider.COLLAPSE_ALL_ICON_PATH);

 	}

-	

+

 	public Image getShortcutIcon() {

 		if (this.shortcutIcon == null) {

 			this.shortcutIcon = createImageDescriptor(ImageProvider.SHORTCUT_ICON_PATH).createImage();

diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java
index 76163ce42..45aafd18d 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/src/org/eclipse/gmt/modisco/infra/browser/uicore/internal/util/Util.java
@@ -28,7 +28,7 @@ public final class Util {
 	/**

 	 * Build a valid Windows filename from the given name (replaces invalid

 	 * characters by underscores)

-	 * 

+	 *

 	 * @param name

 	 *            a non-empty name that can contain illegal file name characters

 	 * @return a valid Windows filename

diff --git a/org.eclipse.gmt.modisco.infra.browser/.checkstyle b/org.eclipse.gmt.modisco.infra.browser/.checkstyle
index d18c65877..6bd51546b 100644
--- a/org.eclipse.gmt.modisco.infra.browser/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.browser/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/Messages.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/Messages.java
index c753a400f..003228179 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/Messages.java
@@ -182,7 +182,7 @@ public final class Messages extends NLS {
 	public static String UI_ErrorFile_message;

 	public static String UI_modiscoEditor_menu;

 	public static String UI_CreateChild_menu_item;

-	

+

 	public static String ErrorsDialog_errors;

 

 	// public static String UI_CreateSibling_menu_item;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/MoDiscoBrowserPlugin.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/MoDiscoBrowserPlugin.java
index 9f52d8e09..cac36f45d 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/MoDiscoBrowserPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/MoDiscoBrowserPlugin.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Nicolas Bros (Mia-Software) - initial API and implementation
- *    
+ *
  *******************************************************************************/
 
 package org.eclipse.gmt.modisco.infra.browser;
@@ -40,7 +40,7 @@ public final class MoDiscoBrowserPlugin extends EMFPlugin {
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
-	 * 
+	 *
 	 * @return the singleton instance.
 	 */
 	@Override
@@ -50,7 +50,7 @@ public final class MoDiscoBrowserPlugin extends EMFPlugin {
 
 	/**
 	 * Returns the singleton instance of the Eclipse plugin.
-	 * 
+	 *
 	 * @return the singleton instance.
 	 */
 	public static Implementation getPlugin() {
@@ -71,7 +71,7 @@ public final class MoDiscoBrowserPlugin extends EMFPlugin {
 	/**
 	 * Returns an image descriptor for the image file at the given plug-in
 	 * relative path
-	 * 
+	 *
 	 * @param path
 	 *            the path
 	 * @return the image descriptor
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/DragAndDropUtils.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/DragAndDropUtils.java
index 91419cd82..c194dde74 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/DragAndDropUtils.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/DragAndDropUtils.java
@@ -27,7 +27,7 @@ public final class DragAndDropUtils {
 	/**

 	 * For each element in the given collection, look for its equivalent (based

 	 * on the element's URI) in the given {@link ResourceSet}.

-	 * 

+	 *

 	 * @param collection

 	 *            the input elements

 	 * @param resourceSet

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java
index 9cf832d1e..73a10cfde 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java
@@ -204,7 +204,7 @@ public class InstancesForMetaclass {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see java.lang.Object#toString()

 	 */

 	@Override

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/LinkItemEx.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/LinkItemEx.java
index 1ed778ec9..e622c9829 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/LinkItemEx.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/LinkItemEx.java
@@ -91,7 +91,7 @@ public class LinkItemEx extends LinkItem implements IEditingDomainItemProvider {
 		}

 		throw new UnsupportedOperationException();

 	}

-	

+

 	@Override

 	public String toString() {

 		return LinkItemEx.class.getSimpleName() + "(" + getText() + ")"; //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/MetaclassList.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/MetaclassList.java
index f010e4c8e..a1d445dba 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/MetaclassList.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/MetaclassList.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.core;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/QueryItem.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/QueryItem.java
index 289ba036e..2acc62608 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/QueryItem.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/QueryItem.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.core;

@@ -54,7 +54,7 @@ public class QueryItem implements ITreeElement {
 

 	/**

 	 * Instantiate a new {@link QueryItem}.

-	 * 

+	 *

 	 * @param parent

 	 *            the model element that appears as the parent of the query item

 	 *            in the tree

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/SearchResults.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/SearchResults.java
index 281e9823a..3c922303a 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/SearchResults.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/SearchResults.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.core;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserActionBarContributor.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserActionBarContributor.java
index 2fdd21da7..1cd90ecd2 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserActionBarContributor.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserActionBarContributor.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Payneau (Mia-Software) - Enable editability

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

@@ -762,7 +762,7 @@ public class BrowserActionBarContributor extends EditingDomainActionBarContribut
 	/**

 	 * Returns false to avoid changing elements from the EPackage registry (i.e.

 	 * metamodels)

-	 * 

+	 *

 	 * @see Bug 319015 - [Model Browser] Null Pointer after deleting a field in

 	 *      a model

 	 * @see Bug 319016 - [Model Browser] ClassCastException while saving a model

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserConfiguration.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserConfiguration.java
index 26ba0ba23..0cd8420ba 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserConfiguration.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserConfiguration.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserNavigationLocation.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserNavigationLocation.java
index 1ced0efae..da48cbb2f 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserNavigationLocation.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserNavigationLocation.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

@@ -46,7 +46,7 @@ public class BrowserNavigationLocation extends NavigationLocation {
 	/**

 	 * Create a navigation location with the selected metaclass and selected

 	 * element(s).

-	 * 

+	 *

 	 * @param editorPart

 	 *            the editor

 	 * @param selectedMetaclass

@@ -100,7 +100,7 @@ public class BrowserNavigationLocation extends NavigationLocation {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.INavigationLocation#mergeInto(org.eclipse.ui.

 	 * INavigationLocation)

 	 */

@@ -133,7 +133,7 @@ public class BrowserNavigationLocation extends NavigationLocation {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.INavigationLocation#restoreLocation()

 	 */

 	public void restoreLocation() {

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserSettingsPersistence.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserSettingsPersistence.java
index 231293047..3874e8c67 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserSettingsPersistence.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserSettingsPersistence.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

@@ -117,7 +117,7 @@ public class BrowserSettingsPersistence implements IPartListener {
 

 	/**

 	 * Save the currently applied {@link Facet}s

-	 * 

+	 *

 	 * @param sectionForCurrentMetamodel

 	 */

 	private void saveLastFacetNames(final IDialogSettings sectionForCurrentMetamodel) {

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserUtils.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserUtils.java
index 863b56aca..c0b00e71d 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserUtils.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/BrowserUtils.java
@@ -178,7 +178,7 @@ public final class BrowserUtils {
 	/**

 	 * Replace proxy objects by their underlying Ecore objects in the given

 	 * selection

-	 * 

+	 *

 	 * @return the unwrapped version of the selection

 	 */

 	public static ISelection unwrapSelection(final ISelection selection) {

@@ -187,7 +187,7 @@ public final class BrowserUtils {
 

 	/**

 	 * Open the given EObject in the MoDisco model browser.

-	 * 

+	 *

 	 * @param eObject

 	 *            the EObject to show in a model browser

 	 * @param useExistingEditor

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
index 3fe04b57b..75f2e4ab2 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
@@ -11,7 +11,7 @@
  *    Nicolas Guyomar (Mia-Software) - Code Synchronization

  *    Nicolas Guyomar (Mia_software) - Bug 333651 Remove of the MoDisco EPackage view and of the metamodel browsing button

  *    Gregoire Dupe (Mia-Software) - Bug 404263 - EditingDomainProvider does not work when using IResourceEditorInput

- *    Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in 

+ *    Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in

  *    Gregoire Dupe (Mia-Software) - Bug 472182 - Missing debug information in EcoreBrowser.handleChangedResources(2636)

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.browser.editors;

@@ -660,7 +660,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 	 * <p>

 	 * <b>see</b>: Bug 325120 - [Model Browser] don't freeze UI while loading

 	 * model

-	 * 

+	 *

 	 * @param monitor

 	 */

 	protected boolean backgroundOpenModel(final IProgressMonitor monitor) {

@@ -889,7 +889,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Create the resourceSet. This method can be overridden by subclasses.

-	 * 

+	 *

 	 * @return The ResourceSet.

 	 */

 	protected ResourceSet createResourceSet() {

@@ -921,7 +921,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 	/**

 	 * If proxies are found, ask the user whether to load resources referenced

 	 * by proxies found in the given resource, and up to which depth.

-	 * 

+	 *

 	 * @param resource

 	 *            the resource in which to look for proxies to resolve

 	 * @param allResources

@@ -943,7 +943,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 	/**

 	 * Adds resources referenced by proxies found in the given resources to the

 	 * set <code>allResources</code>

-	 * 

+	 *

 	 * @param resource

 	 *            the resource in which to look for proxies to resolve

 	 * @param allResources

@@ -951,7 +951,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 	 *            proxies

 	 * @param currentDepth

 	 *            the current depth

-	 * 

+	 *

 	 * @see EcoreBrowser#addReferencedResources(Resource, Set)

 	 */

 	private void addReferencedResourcesInternal(final Resource resource,

@@ -1048,7 +1048,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Create the left pane, containing the metaclass viewer.

-	 * 

+	 *

 	 * @param parent

 	 *            the parent composite

 	 */

@@ -1074,7 +1074,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Create the tree and its viewer

-	 * 

+	 *

 	 * @param parent

 	 *            the parent composite of the tree

 	 */

@@ -1334,7 +1334,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Create the search panel, containing a label and search field.

-	 * 

+	 *

 	 * @param parent

 	 *            the parent composite, which must have a GridLayout

 	 */

@@ -1472,7 +1472,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Adds the given metaclass to the given selection.

-	 * 

+	 *

 	 * @param addSubclasses

 	 *            also adds subclasses

 	 */

@@ -2304,7 +2304,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 	 * Finds the path of the given element in the tree viewer. The element is

 	 * looked for at the root and under BigListItemProviders in the case the

 	 * elements are split.

-	 * 

+	 *

 	 * @return the path or <code>null</code> if the element was not found

 	 */

 	private TreePath findTreePathForElement(final EObject eObject) {

@@ -2361,7 +2361,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Restore a location (used for implementing history).

-	 * 

+	 *

 	 * @param eClass

 	 *            the metaclass viewer's selection

 	 * @param selection

@@ -2392,7 +2392,7 @@ public class EcoreBrowser extends EditorPart implements ISelectionProvider, IMen
 

 	/**

 	 * Refresh the editor

-	 * 

+	 *

 	 * @param metaclassViewerToo

 	 *            whether the metaclass view must be refreshed too, or only the

 	 *            tree viewer

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/LeftPane.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/LeftPane.java
index 555bd4dfc..253d4742b 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/LeftPane.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/LeftPane.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassUnwrappingSelectionProvider.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassUnwrappingSelectionProvider.java
index 4cc969d17..0966644b4 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassUnwrappingSelectionProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassUnwrappingSelectionProvider.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *    Nicolas Bros (Mia-Software) - initial API and implementation
- *    
+ *
  *******************************************************************************/
 
 package org.eclipse.gmt.modisco.infra.browser.editors;
@@ -19,7 +19,7 @@ import org.eclipse.jface.viewers.ISelectionProvider;
  * Unwraps the MetaclassViewer elements (see
  * {@link org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider}, from
  * which this class is derived).
- * 
+ *
  */
 public class MetaclassUnwrappingSelectionProvider extends
 		org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider {
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewToolBar.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewToolBar.java
index dd630f4cb..f314bf534 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewToolBar.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewToolBar.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

@@ -71,7 +71,7 @@ public class MetaclassViewToolBar {
 				}

 			}

 		};

-		// no selection event is sent when clicking on Windows 

+		// no selection event is sent when clicking on Windows

 		if (Platform.getOS().equals(Platform.OS_WIN32)) {

 			// listen on the toolbar so that the menu can appear on MouseDown

 			this.toolBar.addListener(SWT.MouseDown, listener);

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewer.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewer.java
index e414ebba8..2ac1afa24 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewer.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewer.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

@@ -610,7 +610,7 @@ public class MetaclassViewer implements ISelectionProvider {
 

 	/**

 	 * Group the given metaclasses by packages.

-	 * 

+	 *

 	 * @return a list of packages containing metaclasses or other packages

 	 *         recursively

 	 */

@@ -646,7 +646,7 @@ public class MetaclassViewer implements ISelectionProvider {
 	/**

 	 * A recursive function that creates a hierarchy of packages containing

 	 * metaclasses

-	 * 

+	 *

 	 * @param instancesForMetaclass

 	 *            the metaclass to add to a package

 	 * @param path

@@ -729,7 +729,7 @@ public class MetaclassViewer implements ISelectionProvider {
 	/**

 	 * Replace proxy {@link InstancesForMetaclass} objects by their underlying

 	 * Ecore {@link EClass} in the given selection

-	 * 

+	 *

 	 * @return the unwrapped version of the selection

 	 */

 	public static ISelection unwrapSelection(final ISelection selection) {

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewerMenuManager.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewerMenuManager.java
index 6566eef50..757fb5af2 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewerMenuManager.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/MetaclassViewerMenuManager.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/NonBlockingElementComputation.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/NonBlockingElementComputation.java
index 7b91c7872..de00fc683 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/NonBlockingElementComputation.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/NonBlockingElementComputation.java
@@ -26,7 +26,7 @@ import org.eclipse.ui.progress.IWorkbenchSiteProgressService;
 /**

  * Computes a value synchronously initially, and continues asynchronously if the

  * computation takes too much time.

- * 

+ *

  * @param <T>

  *            The type of the result of the computation.

  */

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/TreeToolBar.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/TreeToolBar.java
index fa1fd7045..98e375e77 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/TreeToolBar.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/TreeToolBar.java
@@ -318,7 +318,7 @@ public final class TreeToolBar {
 			TreeToolBar.this.browser.getTreeViewer().collapseAll();

 		}

 	};

-	

+

 	private final Action actionSynchroniseModelWithSourceCode = new Action(Messages.TreeToolBar_synchronizeSourceCode,

 			IAction.AS_CHECK_BOX) {

 		{

@@ -353,8 +353,8 @@ public final class TreeToolBar {
 		this.actionShowElementIDs.setChecked(this.browser.isShowElementIDs());

 		this.actionShowURI.setChecked(this.browser.isShowURI());

 		this.actionSynchroniseModelWithSourceCode.setChecked(this.browser.isSynchronizeSourceCode());

-		

+

 		this.actionShowEmptyAttributes.setEnabled(this.browser.isShowAttributes());

-		

+

 	}

 }

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/WorkspaceChangeListener.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/WorkspaceChangeListener.java
index 034e1febf..7b2ccc290 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/WorkspaceChangeListener.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/WorkspaceChangeListener.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Nicolas Payneau (Mia-Software) - Enable editability

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/ColumnDescription.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/ColumnDescription.java
index 99b4fa87f..2d844c987 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/ColumnDescription.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/ColumnDescription.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors.table;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditor.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditor.java
index 377e1188b..9a6a6a5c7 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditor.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditor.java
@@ -578,7 +578,7 @@ public class TableEditor extends EditorPart implements ISelectionProvider, IMenu
 	/**

 	 * Find and return the element that should be opened when the given column

 	 * is clicked

-	 * 

+	 *

 	 * @param tableElement

 	 */

 	public static EObject findElementToOpenInModelBrowser(final int column,

@@ -907,7 +907,7 @@ public class TableEditor extends EditorPart implements ISelectionProvider, IMenu
 

 	/**

 	 * Find the column with the given {@link ColumnDescription}

-	 * 

+	 *

 	 * @return the column

 	 */

 	private TableColumn findColumn(final ColumnDescription columnDescription) {

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorContentProvider.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorContentProvider.java
index 277258a07..0db77c627 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorContentProvider.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorContentProvider.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors.table;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorFactory.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorFactory.java
index b844d38a9..7287a0f72 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorFactory.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorFactory.java
@@ -44,7 +44,7 @@ public class TableEditorFactory {
 

 	/**

 	 * Open a new table view editor on the given list of elements.

-	 * 

+	 *

 	 * @param browserConfiguration

 	 *            the main editor configuration

 	 * @param elements

@@ -80,7 +80,7 @@ public class TableEditorFactory {
 

 	/**

 	 * Open a new table view editor on the given query result.

-	 * 

+	 *

 	 * @param result

 	 *            the results of a query to display in the table

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorInput.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorInput.java
index ce28acb8d..3fdc03729 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorInput.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorInput.java
@@ -42,7 +42,7 @@ public class TableEditorInput implements IEditorInput {
 

 	/**

 	 * Create an input for all the given elements

-	 * 

+	 *

 	 * @param browserConfiguration

 	 *            the main browser's configuration

 	 * @param tableElements

@@ -81,13 +81,13 @@ public class TableEditorInput implements IEditorInput {
 		for (final EClass eClass : this.metaclasses) {

 			features.addAll(eClass.getEAllStructuralFeatures());

 		}

-		

+

 		this.fFeatures = new ArrayList<EStructuralFeature>(features);

 	}

 

 	/**

 	 * Create an input for all elements of the given class

-	 * 

+	 *

 	 * @param browserConfiguration

 	 *            the main editor configuration

 	 * @param eClass

@@ -113,7 +113,7 @@ public class TableEditorInput implements IEditorInput {
 	public List<TableElement> getElements() {

 		return this.elements;

 	}

-	

+

 	public List<EStructuralFeature> getFeatures() {

 		return this.fFeatures;

 	}

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorToolBar.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorToolBar.java
index cb58ca94a..2d445514c 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorToolBar.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableEditorToolBar.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors.table;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableSorter.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableSorter.java
index 33ceb127f..3d8c1b835 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableSorter.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/table/TableSorter.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.browser.editors.table;

diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/preferences/BrowserPreferencePage.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/preferences/BrowserPreferencePage.java
index d7db0e132..eefc04d7d 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/preferences/BrowserPreferencePage.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/preferences/BrowserPreferencePage.java
@@ -61,7 +61,7 @@ public class BrowserPreferencePage extends FieldEditorPreferencePage implements
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/queries/SelectedQueriesManager.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/queries/SelectedQueriesManager.java
index 10e69fca6..65a6ef5de 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/queries/SelectedQueriesManager.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/queries/SelectedQueriesManager.java
@@ -75,7 +75,7 @@ public class SelectedQueriesManager {
 

 	/**

 	 * Returns the queries selected for the given model element.

-	 * 

+	 *

 	 * @return a list of selected queries (which can be empty) or

 	 *         <code>null</code>

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.common.cdo.derby/.checkstyle b/org.eclipse.gmt.modisco.infra.common.cdo.derby/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo.derby/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.common.cdo.derby/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/DerbyCDOServer.java b/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/DerbyCDOServer.java
index cf8eb10d0..098db9793 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/DerbyCDOServer.java
+++ b/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/DerbyCDOServer.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/internal/Activator.java b/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/internal/Activator.java
index f6c17bfd0..990d6b6a9 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.common.cdo.derby/src/org/eclipse/gmt/modisco/infra/common/cdo/derby/internal/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -26,7 +26,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -39,7 +39,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -52,7 +52,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.common.cdo/.checkstyle b/org.eclipse.gmt.modisco.infra.common.cdo/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.common.cdo/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/internal/Activator.java b/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/internal/Activator.java
index a5905a424..47802bda6 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/internal/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -26,7 +26,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -39,7 +39,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -52,7 +52,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/AbstractCDOServer.java b/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/AbstractCDOServer.java
index ae63f22d9..aa938d450 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/AbstractCDOServer.java
+++ b/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/AbstractCDOServer.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -139,7 +139,7 @@ public abstract class AbstractCDOServer implements Server {
 	protected abstract DataSource getDataSource(final String dbName) throws Exception;

 

 	protected abstract IDBAdapter getDBAdapter();

-	

+

 	public void setRepository(final IRepository repository) {

 		this.repository = repository;

 	}

diff --git a/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/Server.java b/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/Server.java
index 345146167..631c1672f 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/Server.java
+++ b/org.eclipse.gmt.modisco.infra.common.cdo/src/org/eclipse/gmt/modisco/infra/common/cdo/server/Server.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software)

diff --git a/org.eclipse.gmt.modisco.infra.common.core/.checkstyle b/org.eclipse.gmt.modisco.infra.common.core/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.common.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/CommonModiscoActivator.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/CommonModiscoActivator.java
index 57b928824..8e7958ac4 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/CommonModiscoActivator.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/CommonModiscoActivator.java
@@ -16,9 +16,9 @@ import org.osgi.framework.BundleContext;
 

 /**

  * The activator class controls the plug-in life cycle

- * 

+ *

  * @author Gabriel Barbier

- * 

+ *

  */

 public class CommonModiscoActivator extends Plugin {

 

@@ -30,7 +30,7 @@ public class CommonModiscoActivator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -43,7 +43,7 @@ public class CommonModiscoActivator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -56,7 +56,7 @@ public class CommonModiscoActivator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static CommonModiscoActivator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/Messages.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/Messages.java
index 05fc52c26..c6c1003ff 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/Messages.java
@@ -32,7 +32,7 @@ public final class Messages extends NLS {
 	public static String ProjectUtils_0;

 	public static String ProjectUtils_1;

 	public static String ProjectUtils_2;

-	

+

 	public static String ValidationJob_creatingValidationMarkersJobName;

 	public static String ValidationJob_validationJobName;

 

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/MoDiscoProject.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/MoDiscoProject.java
index 44be7f4a9..0d150fa99 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/MoDiscoProject.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/MoDiscoProject.java
@@ -31,7 +31,7 @@ public class MoDiscoProject implements IProjectNature {
 	/**

 	 * The nature of MoDisco projects

 	 */

-	public static final String NATURE_ID = "org.eclipse.gmt.modisco.common.ProjectNature"; //$NON-NLS-1$ 

+	public static final String NATURE_ID = "org.eclipse.gmt.modisco.common.ProjectNature"; //$NON-NLS-1$

 

 	/**

 	 * @see org.eclipse.core.resources.IProjectNature#configure()

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropContentHandler.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropContentHandler.java
index 2692477e9..59f104305 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropContentHandler.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropContentHandler.java
@@ -21,7 +21,7 @@ import org.xml.sax.SAXException;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class AmwPropContentHandler implements ContentHandler {

 

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropParser.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropParser.java
index b5bf8fdec..92ad236c3 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropParser.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/amwpropparser/AmwPropParser.java
@@ -24,7 +24,7 @@ import org.xml.sax.helpers.XMLReaderFactory;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class AmwPropParser {

 

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/AbstractMoDiscoCatalog.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/AbstractMoDiscoCatalog.java
index 24ba2c215..87f2f5fe4 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/AbstractMoDiscoCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/AbstractMoDiscoCatalog.java
@@ -253,7 +253,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method returns the name of the given rootObject. This method must be

 	 * implemented by {@link AbstractMoDiscoCatalog} sub classes.

-	 * 

+	 *

 	 * @param rootObject

 	 *            a resource root object

 	 * @return rootObject name

@@ -264,7 +264,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	 * This method returns the id of the extension point that will be used to

 	 * declare installed models which must be stored in the catalog. This method

 	 * must be implemented by {@link AbstractMoDiscoCatalog} sub classes.

-	 * 

+	 *

 	 * @return the extension point id

 	 */

 	protected abstract String getRegistryExtensionPoint();

@@ -272,7 +272,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * Contains the procedure to open a resource, check it, and add it into the

 	 * specific maps.

-	 * 

+	 *

 	 * @param uri

 	 *            the resource URI to open

 	 * @param file

@@ -465,7 +465,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	 * (modisco:/&lt;subprotocol&gt;/), that will be used to access the

 	 * resources stored by the {@link AbstractMoDiscoCatalog} sub class. This

 	 * method must be implemented by {@link AbstractMoDiscoCatalog} sub classes.

-	 * 

+	 *

 	 * @return the string representing the modisco sub protocol

 	 */

 	protected abstract String getMoDiscoSubProtocol();

@@ -479,7 +479,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This methods returns the root objects of all the resources contained in

 	 * the catalog.

-	 * 

+	 *

 	 * @return root objects

 	 */

 	public final Collection<EObject> getAllRootObjects() {

@@ -496,7 +496,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method returns the root object of the resource having for name the

 	 * "name" parameter value.

-	 * 

+	 *

 	 * @param name

 	 *            the name of a resource contained in the catalog

 	 * @return a root object

@@ -535,14 +535,14 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method must no be used outside this class.

-	 * 

+	 *

 	 * @param declarationFile

 	 * @param pathName

 	 */

 	void removeWSFile(final IFile declarationFile, final String pathName) {

 		if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

 			System.out.println(this.getClass().getSimpleName()

-					+ ".removeWSFile(): file=" + declarationFile); //$NON-NLS-1$ 

+					+ ".removeWSFile(): file=" + declarationFile); //$NON-NLS-1$

 		}

 		URI rootObjectURI = URI.createPlatformResourceURI(pathName, false);

 		EObject oldRootObject = this.concreteUriToEObjectMap.get(rootObjectURI.toString());

@@ -553,14 +553,14 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 					&& !this.nameToWorkspaceEObjectMap.containsKey(rootObjectName)) {

 				System.out

 						.println(this.getClass().getSimpleName()

-								+ ".removeWSFile(): rootObject not contained in this.nameToWorkspaceEObjectMap"); //$NON-NLS-1$ 

+								+ ".removeWSFile(): rootObject not contained in this.nameToWorkspaceEObjectMap"); //$NON-NLS-1$

 			}

 			this.nameToWorkspaceEObjectMap.remove(rootObjectName);

 			this.concreteUriToEObjectMap.remove(rootObjectURI.toString());

 			this.nameToConcreteUriMap.remove(rootObjectName);

 			if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

 				System.out.println(this.getClass().getSimpleName()

-						+ ".removeWSFiles: oldRootObject=" + oldRootObject); //$NON-NLS-1$ 

+						+ ".removeWSFiles: oldRootObject=" + oldRootObject); //$NON-NLS-1$

 			}

 			Resource oldResource = oldRootObject.eResource();

 			if (oldResource != null) {

@@ -575,7 +575,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 						&& !this.nameToWorkspaceEObjectMap.containsKey(rootObjectName)) {

 					System.out

 							.println(this.getClass().getSimpleName()

-									+ ".removeWSFile(): replacing the removed ws root object by the installed version."); //$NON-NLS-1$ 

+									+ ".removeWSFile(): replacing the removed ws root object by the installed version."); //$NON-NLS-1$

 				}

 				EObject modiscoResourceRoot = copyToMoDiscoResource(installedVersion,

 						rootObjectName);

@@ -605,7 +605,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 		} else {

 			if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

 				System.out.println(this.getClass().getSimpleName()

-						+ ".removeWSFiles: oldRootObject=null"); //$NON-NLS-1$ 

+						+ ".removeWSFiles: oldRootObject=null"); //$NON-NLS-1$

 			}

 		}

 		save();

@@ -624,7 +624,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	 * {@link #nameToConcreteUriMap}. The URI is reloaded from the extension

 	 * registry, because it was lost when a workspace version replaced the

 	 * installed version.

-	 * 

+	 *

 	 * @param modiscoResourceRoot

 	 */

 	private void restoreInstalledURI(final String rootObjectName, final EObject modiscoResourceRoot) {

@@ -669,7 +669,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 					for (IFile declarationFile : pathNames.keySet()) {

 						if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

 							System.out

-									.println("executing remove ws files: " + this + "file=" + declarationFile); //$NON-NLS-1$ //$NON-NLS-2$ 

+									.println("executing remove ws files: " + this + "file=" + declarationFile); //$NON-NLS-1$ //$NON-NLS-2$

 						}

 						removeWSFile(declarationFile, pathNames.get(declarationFile));

 					}

@@ -677,7 +677,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 			}

 		};

 		if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

-			System.out.println("scheduleRemoveWSFiles: " + action); //$NON-NLS-1$ 

+			System.out.println("scheduleRemoveWSFiles: " + action); //$NON-NLS-1$

 		}

 		CatalogJob.getInstance().addAction(action);

 	}

@@ -714,7 +714,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method returns the nsURI of a given rootObject. This method must be

 	 * implemented by {@link AbstractMoDiscoCatalog} sub classes.

-	 * 

+	 *

 	 * @param rootObject

 	 *            a root eObject

 	 * @return a nsURI

@@ -736,7 +736,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 		}

 

 		if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

-			System.out.println("internalAddWSFile: file=" + declarationFile); //$NON-NLS-1$ 

+			System.out.println("internalAddWSFile: file=" + declarationFile); //$NON-NLS-1$

 		}

 		EObject rootEObject = null;

 		if (declarationFile.exists()

@@ -777,7 +777,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method is used by builders to update resources in the catalog.

-	 * 

+	 *

 	 * @param declarationFile

 	 *            the EMF resource file

 	 * @return the root object of the resource

@@ -883,7 +883,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method returns the URI of the file containing the root object with

 	 * the given name.

-	 * 

+	 *

 	 * @param name

 	 *            a root object name

 	 * @return the URI of a file

@@ -912,7 +912,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method is used to add a listener for catalog changes. This method is

 	 * called by the views presenting the catalog contents

-	 * 

+	 *

 	 * @param modiscoCatalogChangeListener

 	 *            a listener

 	 */

@@ -929,7 +929,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method is used to remove a catalog change listener. This method is

 	 * called by the views presenting the catalog contents

-	 * 

+	 *

 	 * @param modiscoCatalogChangeListener

 	 *            listener to remove

 	 */

@@ -943,7 +943,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method is called by builders to clean the catalog contents.

-	 * 

+	 *

 	 * @param project

 	 *            project to clean

 	 */

@@ -1056,7 +1056,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * This method returns the installed bundle containing the resource file

 	 * from which the eObject parameter has been created

-	 * 

+	 *

 	 * @param rootObject

 	 *            an eObject (must be a resource root)

 	 * @return the installed bundle containing eObject

@@ -1131,7 +1131,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	public synchronized void revalidateAll(final IProject project) {

 		if (AbstractMoDiscoCatalog.SCHEDULING_DEBUG) {

-			System.out.println("revalidateAll: project=" + project); //$NON-NLS-1$ 

+			System.out.println("revalidateAll: project=" + project); //$NON-NLS-1$

 		}

 		for (String name : getNameToWorkspaceEObjectMap().keySet()) {

 			URI uri = this.nameToConcreteUriMap.get(name);

@@ -1193,7 +1193,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 	/**

 	 * Schedules the given {@link Runnable} to be executed when the catalog has

 	 * finished building (waits until the build jobs are all finished).

-	 * 

+	 *

 	 * @param runnable

 	 *            the runnable to be run when the catalog has finished building

 	 */

@@ -1231,7 +1231,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method is used by builders to update resources in the catalog.

-	 * 

+	 *

 	 * @param declarationFile

 	 *            the EMF resource file

 	 * @return the root object of the resource

@@ -1250,7 +1250,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method is used by builders to add resources into the catalog.

-	 * 

+	 *

 	 * @param declarationFile

 	 *            the EMF resource file

 	 * @return the root object of the resource

@@ -1268,7 +1268,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method is used by builders to remove resources from the catalog.

-	 * 

+	 *

 	 * @param declarationFile

 	 *            the EMF resource file

 	 * @deprecated This method has been replaced by

@@ -1284,7 +1284,7 @@ public abstract class AbstractMoDiscoCatalog implements IMoDiscoResourceListener
 

 	/**

 	 * This method is used by builders to update resources in the catalog.

-	 * 

+	 *

 	 * @param declarationFile

 	 *            the EMF resource file

 	 * @param update

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ElementWithSameNameException.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ElementWithSameNameException.java
index 9a66247bd..82759eda2 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ElementWithSameNameException.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ElementWithSameNameException.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *******************************************************************************/

- 

+

 package org.eclipse.gmt.modisco.infra.common.core.internal.builder;

 

 public class ElementWithSameNameException extends OpenResourceException {

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/IModiscoBuilder.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/IModiscoBuilder.java
index b6d5fb84c..8dce2746f 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/IModiscoBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/IModiscoBuilder.java
@@ -22,9 +22,9 @@ import org.eclipse.core.runtime.IProgressMonitor;
  * implementing this interface. This set of classes is defined though the use of

  * the <tt>org.eclipse.gmt.modisco.infra.common.core.internal.builder.register</tt> extension

  * point.

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

- * 

+ *

  */

 public interface IModiscoBuilder {

 

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ModiscoProjectBuilder.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ModiscoProjectBuilder.java
index ca296d711..15161a5b7 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ModiscoProjectBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/builder/ModiscoProjectBuilder.java
@@ -29,7 +29,7 @@ import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;
 

 /**

  * This class is the MoDisco project builder implementation.

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

  */

 public class ModiscoProjectBuilder extends IncrementalProjectBuilder {

@@ -208,7 +208,7 @@ public class ModiscoProjectBuilder extends IncrementalProjectBuilder {
 

 		/*

 		 * (non-Javadoc)

-		 * 

+		 *

 		 * @see java.lang.Object#toString()

 		 */

 		@Override

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/extensions/AbstractRegistry.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/extensions/AbstractRegistry.java
index 7f2af7b4f..1a08d044a 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/extensions/AbstractRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/extensions/AbstractRegistry.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.common.core.internal.extensions;

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/logging/MoDiscoLogHandler.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/logging/MoDiscoLogHandler.java
index d61066bef..2072b5bb5 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/logging/MoDiscoLogHandler.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/logging/MoDiscoLogHandler.java
@@ -1,11 +1,11 @@
 /**

- * Copyright (c) 2008, 2011 Mia-Software. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2008, 2011 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

- * 

- * Contributor: 

+ *

+ * Contributor:

  *     Hugues Dubourg

  */

 

@@ -23,9 +23,9 @@ import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;
 

 /**

  * Log to a file

- * 

+ *

  * @author hdubourg

- * 

+ *

  */

 public class MoDiscoLogHandler extends Handler {

 

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceConstants.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceConstants.java
index bcb3a0d93..81b4bc497 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceConstants.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceConstants.java
@@ -14,7 +14,7 @@ package org.eclipse.gmt.modisco.infra.common.core.internal.preferences;
  * Constant definitions for plug-in preferences
  */
 public final class PreferenceConstants {
-	
+
 	private PreferenceConstants() {
 		// constants class: no need to instantiate
 	}
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceInitializer.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceInitializer.java
index 29a5f5232..3ace0e480 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceInitializer.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/preferences/PreferenceInitializer.java
@@ -19,7 +19,7 @@ public class PreferenceInitializer extends AbstractPreferenceInitializer {
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @seeorg.eclipse.core.runtime.preferences.AbstractPreferenceInitializer#
 	 * initializeDefaultPreferences()
 	 */
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/IModiscoProtocolExtension.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/IModiscoProtocolExtension.java
index 6047c2985..4a73e2f5f 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/IModiscoProtocolExtension.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/IModiscoProtocolExtension.java
@@ -16,14 +16,14 @@ import org.eclipse.emf.common.util.URI;
  * An implementation of the interface must be provided through the

  * org.eclipse.gmt.modisco.common.core.protocolext extension point to register a

  * MoDisco sub-protocol.

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

  */

 public interface IModiscoProtocolExtension {

 

 	/**

 	 * This method returns the uri of the model containing the searched element.

-	 * 

+	 *

 	 * @param name

 	 *            the searched element name

 	 */

@@ -33,7 +33,7 @@ public interface IModiscoProtocolExtension {
 	 * This method returns the sub-protocol name. For example, if this method

 	 * returns _query_ then when a URI begins with modisco:/query/ the URI

 	 * resolution will be delegated to this class.

-	 * 

+	 *

 	 * @return the sub-protocol name

 	 */

 	public String getSchemeSpecificPart();

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolException.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolException.java
index 5363f1098..8d1d82880 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolException.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolException.java
@@ -16,9 +16,9 @@ import org.eclipse.emf.ecore.resource.Resource;
 

 /**

  * Modisco Protocol Exception

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

- * 

+ *

  */

 public class ModiscoProtocolException extends IOException implements Resource.Diagnostic {

 

@@ -26,7 +26,7 @@ public class ModiscoProtocolException extends IOException implements Resource.Di
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see java.lang.IOException#IOException()

 	 */

 	public ModiscoProtocolException() {

@@ -35,7 +35,7 @@ public class ModiscoProtocolException extends IOException implements Resource.Di
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see java.lang.IOException#IOException(String)

 	 */

 	public ModiscoProtocolException(final String message) {

@@ -59,7 +59,7 @@ public class ModiscoProtocolException extends IOException implements Resource.Di
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic#getColumn()

 	 */

 	public int getColumn() {

@@ -68,7 +68,7 @@ public class ModiscoProtocolException extends IOException implements Resource.Di
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic#getLine()

 	 */

 	public int getLine() {

@@ -77,7 +77,7 @@ public class ModiscoProtocolException extends IOException implements Resource.Di
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.emf.ecore.resource.Resource.Diagnostic#getLocation()

 	 */

 	public String getLocation() {

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolExtensionRegistry.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolExtensionRegistry.java
index 58268629c..b50148e09 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolExtensionRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoProtocolExtensionRegistry.java
@@ -22,7 +22,7 @@ import org.eclipse.gmt.modisco.infra.common.core.internal.CommonModiscoActivator
  * This class offers methods to get the description of the MoDisco sub-protocol

  * registered through the org.eclipse.gmt.modisco.common.core.protocolext

  * extension point.

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

  * @see ModiscoResourceFactoryImpl

  */

@@ -60,7 +60,7 @@ public final class ModiscoProtocolExtensionRegistry {
 	}

 

 	/**

-	 * 

+	 *

 	 * @return the map pointing to the class implementing

 	 *         IModiscoProtocolExtension for each registered MoDisco

 	 *         sub-protocol

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoResourceFactoryImpl.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoResourceFactoryImpl.java
index 19014fe2b..e851a1763 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoResourceFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoResourceFactoryImpl.java
@@ -31,7 +31,7 @@ import org.eclipse.gmt.modisco.infra.common.core.internal.resource.MoDiscoResour
  * The values of &lt;sub-protocol&gt; are defined through the

  * <tt>org.eclipse.gmt.modisco.common.core.protocolext</tt> extension point.

  * </ul>

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

  */

 public class ModiscoResourceFactoryImpl extends XMIResourceFactoryImpl {

@@ -45,7 +45,7 @@ public class ModiscoResourceFactoryImpl extends XMIResourceFactoryImpl {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see XMIResourceFactoryImpl#createResource(URI)

 	 */

 	@Override

@@ -53,7 +53,7 @@ public class ModiscoResourceFactoryImpl extends XMIResourceFactoryImpl {
 		Resource xmiResource = new XMIResourceImpl(uri) {

 			/*

 			 * (non-Javadoc)

-			 * 

+			 *

 			 * @see

 			 * org.eclipse.emf.ecore.resource.impl.ResourceImpl#getURIConverter

 			 * ()

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoURIHandler.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoURIHandler.java
index 19617a516..7fe22c760 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoURIHandler.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/protocol/ModiscoURIHandler.java
@@ -34,7 +34,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#canHandle(org.eclipse.emf.common

 	 * .util.URI)

@@ -45,7 +45,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#contentDescription(org.eclipse

 	 * .emf.common.util.URI, java.util.Map)

@@ -63,7 +63,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#createInputStream(org.eclipse

 	 * .emf.common.util.URI, java.util.Map)

@@ -80,7 +80,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#createOutputStream(org.eclipse

 	 * .emf.common.util.URI, java.util.Map)

@@ -98,7 +98,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#delete(org.eclipse.emf.common

 	 * .util.URI, java.util.Map)

@@ -115,7 +115,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#exists(org.eclipse.emf.common

 	 * .util.URI, java.util.Map)

@@ -137,7 +137,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#getAttributes(org.eclipse.emf

 	 * .common.util.URI, java.util.Map)

@@ -159,7 +159,7 @@ public class ModiscoURIHandler implements URIHandler {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.emf.ecore.resource.URIHandler#setAttributes(org.eclipse.emf

 	 * .common.util.URI, java.util.Map, java.util.Map)

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/MoDiscoResourceSet.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/MoDiscoResourceSet.java
index ab4e7e411..be172163f 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/MoDiscoResourceSet.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/MoDiscoResourceSet.java
@@ -64,7 +64,7 @@ public final class MoDiscoResourceSet extends ResourceSetImpl {
 

 	/**

 	 * Return a loaded (or reloaded) EMF resource.

-	 * 

+	 *

 	 * @param uri

 	 *            the resource

 	 * @param listener

@@ -175,10 +175,10 @@ public final class MoDiscoResourceSet extends ResourceSetImpl {
 	/**

 	 * This method is used to notify the resource set that one of its resources

 	 * has been reloaded.

-	 * 

+	 *

 	 * This method is used by the

 	 * {@link AbstractMoDiscoCatalog#addWSFile(IFile)} method.

-	 * 

+	 *

 	 * @param resource

 	 *            a reloaded resource

 	 */

@@ -222,7 +222,7 @@ public final class MoDiscoResourceSet extends ResourceSetImpl {
 

 	/**

 	 * Create a URI converter that includes the {@link ModiscoURIHandler}

-	 * 

+	 *

 	 * @author nbros

 	 */

 	public static synchronized URIConverter createURIConverter() {

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/NoExternalLoadXmlResourceImpl.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/NoExternalLoadXmlResourceImpl.java
index 851463a64..2d6cd4bb5 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/NoExternalLoadXmlResourceImpl.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/resource/NoExternalLoadXmlResourceImpl.java
@@ -27,7 +27,7 @@ import org.xml.sax.SAXNotRecognizedException;
  * An extension of XMLResourceImpl EMF class in order to open files referencing

  * DTD. The aim is to avoid issues occuring when the XML parser tries to check

  * the DTD online if Internet connection is not available.

- * 

+ *

  */

 public class NoExternalLoadXmlResourceImpl extends XMLResourceImpl {

 

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java
index 58d3ba415..8e9cc6f79 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/BuildPropertiesUtils.java
@@ -38,7 +38,7 @@ public final class BuildPropertiesUtils {
 

 	/**

 	 * Get the build model of an Eclipse plug-in

-	 * 

+	 *

 	 * @param model

 	 *            a plug-in's PDE model

 	 * @return a build model or <code>null</code> if the build.properties file

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ColorUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ColorUtils.java
index 110419c20..3470af60e 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ColorUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ColorUtils.java
@@ -21,7 +21,7 @@ public final class ColorUtils {
 	/**

 	 * Get a color between red (for 0%) and green (for 100%), depending on the

 	 * given percentage.

-	 * 

+	 *

 	 * @param ratio

 	 *            a value between 0.0 and 1.0, inclusive.

 	 * @return a color between red and green, as a string formatted as

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java
index b8e2816ea..e2a4e3ce2 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FileUtils.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    Grégoire Dupé (Mia-Software) - Bug 470578 - [Depercated] org.eclipse.gmt.modisco.infra.query 

+ *    Grégoire Dupé (Mia-Software) - Bug 470578 - [Depercated] org.eclipse.gmt.modisco.infra.query

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.common.core.internal.utils;

 

@@ -112,7 +112,7 @@ public final class FileUtils {
 

 	/**

 	 * Returns the workspace file in which the resource is defined.

-	 * 

+	 *

 	 * @param resource

 	 *            the resource, with a "platform:/resource/" URI

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FolderUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FolderUtils.java
index 2e4069b1c..2960b624f 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FolderUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/FolderUtils.java
@@ -49,13 +49,13 @@ public final class FolderUtils {
 

 		/**

 		 * Tests if a specified file should be included in a file list.

-		 * 

-		 * 

+		 *

+		 *

 		 * @param dir

 		 *            the directory in which the file was found.

 		 * @param name

 		 *            the name of the file.

-		 * 

+		 *

 		 * @return <code>true</code> if and only if the name should be included

 		 *         in the file list; <code>false</code> otherwise.

 		 */

@@ -397,7 +397,7 @@ public final class FolderUtils {
 

 	/**

 	 * Copies the source file to the target file.

-	 * 

+	 *

 	 * @return <code>true</code> if successful, <code>false</code> otherwise

 	 */

 	public static final boolean copyFile(final File source, final File destination) {

@@ -439,7 +439,7 @@ public final class FolderUtils {
 

 	/**

 	 * Recursively delete a directory.

-	 * 

+	 *

 	 * @param directory

 	 *            directory to delete

 	 * @throws IOException

@@ -471,7 +471,7 @@ public final class FolderUtils {
 

 	/**

 	 * write a new content into a given file.

-	 * 

+	 *

 	 * @param source

 	 *            source file. It will be created if it does not exist.

 	 * @param newContent

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ModelUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ModelUtils.java
index f498aab40..b5f36f335 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ModelUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ModelUtils.java
@@ -4,8 +4,8 @@
  * 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

- * 

- * 

+ *

+ *

  *******************************************************************************/

 package org.eclipse.gmt.modisco.infra.common.core.internal.utils;

 

@@ -46,7 +46,7 @@ import org.eclipse.emf.edit.provider.IItemLabelProvider;
 

 /**

  * Utility class for models.

- * 

+ *

  */

 public final class ModelUtils {

 	private static ResourceSet resourceSet = new ResourceSetImpl();

@@ -64,7 +64,7 @@ public final class ModelUtils {
 	/**

 	 * Loads a model from a {@link java.io.File File} in a given

 	 * {@link ResourceSet}.

-	 * 

+	 *

 	 * @param file

 	 *            where the model is stored.

 	 * @return The model loaded from the URI.

@@ -78,7 +78,7 @@ public final class ModelUtils {
 

 	/**

 	 * Loads a model from a {@link URI}.

-	 * 

+	 *

 	 * @param modelURI

 	 *            the URI of the model.

 	 * @return The model loaded from the URI.

@@ -121,7 +121,7 @@ public final class ModelUtils {
 

 	/**

 	 * Metamodel register : allows to open/compare specific models.

-	 * 

+	 *

 	 * @param metamodelURI

 	 *            the metamodel URI

 	 * @throws IOException

@@ -169,7 +169,7 @@ public final class ModelUtils {
 

 	/**

 	 * Serializes the given EObjet as a String.

-	 * 

+	 *

 	 * @param root

 	 *            Root of the objects to be serialized.

 	 * @return The given EObjet serialized as a String.

@@ -191,7 +191,7 @@ public final class ModelUtils {
 	/**

 	 * Returns a name for the given model element from the EMF global registry,

 	 * or use a default name taken from a String attribute.

-	 * 

+	 *

 	 * @return a name for the given element

 	 */

 	public static String getName(final EObject eObject) {

@@ -285,7 +285,7 @@ public final class ModelUtils {
 	/**

 	 * Compute the resources referenced directly or indirectly from a given

 	 * resource

-	 * 

+	 *

 	 * @param resource

 	 * @param allReferencedResources

 	 *            parameter inout which is completed with the referenced

@@ -372,7 +372,7 @@ public final class ModelUtils {
 	 * Computes the packages referenced, directly or indirectly, from the given

 	 * EPackage. "referenced" term covers here inheritance, references composite

 	 * or not.

-	 * 

+	 *

 	 * @param aPackage

 	 * @return

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PathUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PathUtils.java
index b820710bd..8e29d9b21 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PathUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PathUtils.java
@@ -30,7 +30,7 @@ public final class PathUtils {
 

 	/**

 	 * Get a file from a Workspace project or an installed bundle.

-	 * 

+	 *

 	 * @param resourcePath

 	 *            path to the file. The first segment is the project name or

 	 *            bundle id.

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PluginUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PluginUtils.java
index 88af993b6..9fb09d6ae 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PluginUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/PluginUtils.java
@@ -57,7 +57,7 @@ public final class PluginUtils {
 	/**

 	 * Returns whether the given file is registered in the plugin.xml of the

 	 * given project, using the given extension point.

-	 * 

+	 *

 	 * @param extensionPoint

 	 *            the extension point that is used to register elements of this

 	 *            kind (elements must be declared with a "file" attribute)

@@ -76,7 +76,7 @@ public final class PluginUtils {
 

 	/**

 	 * Returns the value of an attribute in an extension point.

-	 * 

+	 *

 	 * @param project

 	 *            the project in which to look for an extension

 	 * @param extensionPoint

@@ -114,7 +114,7 @@ public final class PluginUtils {
 	/**

 	 * Registers the given file in the plugin.xml of its containing project,

 	 * using the given extension point.

-	 * 

+	 *

 	 * @param file

 	 *            the file to register

 	 * @param extensionPointId

@@ -139,15 +139,15 @@ public final class PluginUtils {
 	 * Registers an extension in the plugin.xml of the given project, using the

 	 * given extension point. If the plugin.xml file doesn't exist, it will be

 	 * created an registered in the build.properties.

-	 * 

+	 *

 	 * The extension will look like this:

-	 * 

+	 *

 	 * <pre>

 	 * &lt;extension point="extensionPointId"&gt;

 	 *   &lt;elementName attribute0="value0" attribute1="value1" ... /&gt;

 	 * &lt;/extension&gt;

 	 * </pre>

-	 * 

+	 *

 	 * @param project

 	 *            the project in which to register an extension

 	 * @param extensionPointId

@@ -267,7 +267,7 @@ public final class PluginUtils {
 

 	/**

 	 * Add a list of required bundles to a plug-in project.

-	 * 

+	 *

 	 * @param project

 	 *            the plug-in project whose Manifest.MF to modify

 	 * @param requiredBundles

@@ -335,7 +335,7 @@ public final class PluginUtils {
 	/**

 	 * Reads the MANIFEST.MF of the given project, modifies it using the

 	 * provided operation, and writes it back to its file.

-	 * 

+	 *

 	 * @param project

 	 *            the project whose Manifest to modify

 	 * @param manifestModificationOperation

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java
index 800727856..56a2b5cdd 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/ProjectUtils.java
@@ -66,7 +66,7 @@ import com.ibm.icu.lang.UCharacter;
 

 /**

  * @author Gregoire DUPE (Mia-Software), Fabien Giquel (Mia-Software)

- * 

+ *

  */

 public final class ProjectUtils {

 

@@ -403,7 +403,7 @@ public final class ProjectUtils {
 

 	/**

 	 * Create MoDisco project

-	 * 

+	 *

 	 * @param project

 	 * @param monitor

 	 * @throws CoreException

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/StringUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/StringUtils.java
index 8ada76adc..609f2b705 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/StringUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/utils/StringUtils.java
@@ -55,7 +55,7 @@ public final class StringUtils {
 	 * Truncate the given String before the first newline or a maximum number of

 	 * characters, whichever comes first. Adds an ellipsis ("...") if it was

 	 * effectively truncated.

-	 * 

+	 *

 	 * @param str

 	 *            the string to truncate

 	 * @return the part of the given string before the first newline

@@ -107,7 +107,7 @@ public final class StringUtils {
 	 * in <code>charsToEscape</code> by <code>escapeChar</code> followed by the

 	 * corresponding character from <code>replacementChars</code>. If

 	 * <code>escapeChar</code> is present in the input string, it is doubled.

-	 * 

+	 *

 	 * @param str

 	 *            the string to escape

 	 * @param escapeChar

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/validation/ValidationUtils.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/validation/ValidationUtils.java
index 024df39d8..6794f0139 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/validation/ValidationUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/validation/ValidationUtils.java
@@ -39,7 +39,7 @@ public final class ValidationUtils {
 	 * <p>

 	 * Puts warning markers on the plugin.xml, build.properties, or directly on

 	 * the project if needed. Replaces previous markers of the same type.

-	 * 

+	 *

 	 * @param project

 	 *            the project in which the element should be registered

 	 * @param extensionToCheck

diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
index c25684851..a4302a59c 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
+++ b/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/logging/MoDiscoLogger.java
@@ -22,7 +22,7 @@ import org.eclipse.gmt.modisco.infra.common.core.internal.CommonModiscoActivator
 

 /**

  * Helper for logging using Eclipse API

- * 

+ *

  * @author fgiquel

  * @deprecated Replaced by org.eclipse.emf.facet.util.core.Logger,

  *             cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470725

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/.checkstyle b/org.eclipse.gmt.modisco.infra.common.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.common.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/MoDiscoCommonUIPlugin.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/MoDiscoCommonUIPlugin.java
index ebed0e7d3..72d58fc4d 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/MoDiscoCommonUIPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/MoDiscoCommonUIPlugin.java
@@ -28,7 +28,7 @@ public class MoDiscoCommonUIPlugin extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -41,7 +41,7 @@ public class MoDiscoCommonUIPlugin extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -54,7 +54,7 @@ public class MoDiscoCommonUIPlugin extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static MoDiscoCommonUIPlugin getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/FormStyleSashForm.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/FormStyleSashForm.java
index e0e99c196..4da08a8f5 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/FormStyleSashForm.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/FormStyleSashForm.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.common.ui.internal.controls;

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/MetamodelSelectionControl.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/MetamodelSelectionControl.java
index d09d7e8ff..c5fbf9bac 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/MetamodelSelectionControl.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/MetamodelSelectionControl.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.common.ui.internal.controls;

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/Tooltip.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/Tooltip.java
index 9d2d008c7..dd5a31889 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/Tooltip.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/controls/Tooltip.java
@@ -145,7 +145,7 @@ public abstract class Tooltip {
 	/**

 	 * Overload this method to position the tooltip where you want. By default

 	 * it is below the cursor.

-	 * 

+	 *

 	 * @param item

 	 *            the item that was hovered to show the tooltip

 	 * @param pt

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/dialogs/GetMoDiscoResourceDialog.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/dialogs/GetMoDiscoResourceDialog.java
index e4fce9d09..9dfed2e93 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/dialogs/GetMoDiscoResourceDialog.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/dialogs/GetMoDiscoResourceDialog.java
@@ -103,7 +103,7 @@ public class GetMoDiscoResourceDialog extends ElementTreeSelectionDialog {
 

 	private static ILabelProvider createLabelProvider() {

 		return new LabelProvider() {

-			

+

 			@Override

 			public boolean isLabelProperty(final Object element, final String property) {

 				if (element instanceof AbstractMoDiscoCatalog) {

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/preferences/MoDiscoRootPreferencePage.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/preferences/MoDiscoRootPreferencePage.java
index 23f9f9733..fa147e125 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/preferences/MoDiscoRootPreferencePage.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/preferences/MoDiscoRootPreferencePage.java
@@ -50,7 +50,7 @@ public class MoDiscoRootPreferencePage extends FieldEditorPreferencePage impleme
 
 	/*
 	 * (non-Javadoc)
-	 * 
+	 *
 	 * @see
 	 * org.eclipse.ui.IWorkbenchPreferencePage#init(org.eclipse.ui.IWorkbench)
 	 */
diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageProvider.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageProvider.java
index 96a9b214d..5abc07245 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageProvider.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageProvider.java
@@ -22,7 +22,7 @@ public class ImageProvider {
 	private static final String MODISCO_LOGO = "icons/logoMoDiscoMini.gif"; //$NON-NLS-1$

 	protected static final String CATALOG_ICON_URL = "/icons/catalog.png"; //$NON-NLS-1$

 	protected static final String ERROR_ICON_URL = "/icons/error.png"; //$NON-NLS-1$

-	

+

 	private static ImageProvider instance = new ImageProvider();

 	private Image modiscoLogo;

 	private Image catalog = null;

@@ -33,7 +33,7 @@ public class ImageProvider {
 

 	/**

 	 * Create an image descriptor from a resource

-	 * 

+	 *

 	 * @param resourcePath

 	 *            the path of the resource (in the bundle)

 	 * @return the image descriptor

@@ -66,7 +66,7 @@ public class ImageProvider {
 		}

 		return this.catalog;

 	}

-	

+

 	/** Return the icon representing a red cross */

 	public Image getErrorIcon() {

 		if (this.catalog == null) {

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageUtils.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageUtils.java
index 079a3fa5c..030f1673a 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/ImageUtils.java
@@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.Image;
 

 /**

  * @author Gregoire DUPE

- * 

+ *

  */

 public final class ImageUtils {

 	private static AdapterFactory composedAdapterFactory = new ComposedAdapterFactory(

@@ -32,7 +32,7 @@ public final class ImageUtils {
 	/**

 	 * Returns an image for the given model element from the EMF global

 	 * registry.

-	 * 

+	 *

 	 * @return an image or <code>null</code> if none was found for the given

 	 *         element

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/JavaUtils.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/JavaUtils.java
index 50012831e..b81e9d50d 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/JavaUtils.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/JavaUtils.java
@@ -48,7 +48,7 @@ public final class JavaUtils {
 

 	/**

 	 * Open a dialog to let the user choose a type.

-	 * 

+	 *

 	 * @param javaProject

 	 *            a project in which types are found (may be <code>null</code>,

 	 *            in which case only <code>additionalBundlesInSearchPath</code>

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/StringMatcher.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/StringMatcher.java
index 430b7ac93..3700ca0fb 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/StringMatcher.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/util/StringMatcher.java
@@ -16,7 +16,7 @@ import com.ibm.icu.lang.UCharacter;
 

 /**

  * A string pattern matcher. Supports '*' and '?' wildcards.

- * 

+ *

  * FIXME yet another duplicated version of StringMatcher (Bug 269424)

  */

 public class StringMatcher {

@@ -62,17 +62,17 @@ public class StringMatcher {
 	 * StringMatcher constructor takes in a String object that is a simple

 	 * pattern which may contain '*' for 0 and many characters and '?' for

 	 * exactly one character.

-	 * 

+	 *

 	 * Literal '*' and '?' characters must be escaped in the pattern e.g.,

 	 * "\*" means literal "*", etc.

-	 * 

+	 *

 	 * Escaping any other character (including the escape character itself),

 	 * just results in that character in the pattern. e.g., "\a" means "a" and

 	 * "\\" means "\"

-	 * 

+	 *

 	 * If invoking the StringMatcher with string literals in Java, don't forget

 	 * escape characters are represented by "\\".

-	 * 

+	 *

 	 * @param pattern

 	 *            the pattern to match text against

 	 * @param ignoreCase

@@ -101,7 +101,7 @@ public class StringMatcher {
 	/**

 	 * Find the first occurrence of the pattern between <code>start</code>

 	 * )(inclusive) and <code>end</code>(exclusive).

-	 * 

+	 *

 	 * @param text

 	 *            the String object to search in

 	 * @param start

@@ -174,7 +174,7 @@ public class StringMatcher {
 

 	/**

 	 * match the given <code>text</code> with the pattern

-	 * 

+	 *

 	 * @return true if matched otherwise false

 	 * @param text

 	 *            a String object

@@ -187,7 +187,7 @@ public class StringMatcher {
 	 * Given the starting (inclusive) and the ending (exclusive) positions in

 	 * the <code>text</code>, determine if the given substring matches with

 	 * aPattern

-	 * 

+	 *

 	 * @return true if the specified portion of the text matches the pattern

 	 * @param text

 	 *            a String object that contains the substring to match

@@ -411,7 +411,7 @@ public class StringMatcher {
 	}

 

 	/**

-	 * 

+	 *

 	 * @return boolean

 	 * @param text

 	 *            a String to match

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectCreationOperation.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectCreationOperation.java
index ac31856d8..785f6f2f8 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectCreationOperation.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectCreationOperation.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.actions.WorkspaceModifyOperation;
  * This operation creates a new project with MoDisco, Java and Plugin natures.

  * It initializes the Classpath and plugin configuration files with default

  * values.

- * 

+ *

  */

 public class NewProjectCreationOperation extends WorkspaceModifyOperation {

 	private IPath projectLocation = null;

diff --git a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectWizard.java b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectWizard.java
index 2328f51a5..03a5efcaf 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectWizard.java
+++ b/org.eclipse.gmt.modisco.infra.common.ui/src/org/eclipse/gmt/modisco/infra/common/ui/internal/wizards/NewProjectWizard.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.part.ISetSelectionTarget;
 

 /**

  * This wizard proposes to create a basic new MoDisco project.

- * 

+ *

  */

 public class NewProjectWizard extends Wizard implements INewWizard {

 

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/.checkstyle b/org.eclipse.gmt.modisco.infra.facet.core/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.facet.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java
index a384fa408..8876faaa1 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetSetCatalog.java
@@ -100,7 +100,7 @@ public final class FacetSetCatalog extends EcoreCatalog implements ModiscoCatalo
 	/**

 	 * This method returns the facet set of the resource having for name the

 	 * "name" parameter value.

-	 * 

+	 *

 	 * @param name

 	 *            the name of a resource contained in the catalog

 	 * @return return a facet set

@@ -112,7 +112,7 @@ public final class FacetSetCatalog extends EcoreCatalog implements ModiscoCatalo
 	/**

 	 * Get the set of default {@link FacetSet}s that apply to the given

 	 * {@link EPackage}.

-	 * 

+	 *

 	 * @param ePackage

 	 *            the package for which matching {@link FacetSet}s will be

 	 *            returned

@@ -133,7 +133,7 @@ public final class FacetSetCatalog extends EcoreCatalog implements ModiscoCatalo
 	/**

 	 * This methods returns the facet sets of all the resources contained in the

 	 * catalog.

-	 * 

+	 *

 	 * @return returns all the facet sets

 	 */

 	public Collection<FacetSet> getAllFacetSets() {

@@ -179,7 +179,7 @@ public final class FacetSetCatalog extends EcoreCatalog implements ModiscoCatalo
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.gmt.modisco.infra.common.core.internal.builder.EcoreCatalog

 	 * #getActivator()

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java
index 0f63e6252..a7b90cd5d 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/ModiscoFacetException.java
@@ -18,12 +18,12 @@ package org.eclipse.gmt.modisco.infra.facet.core.exception;
 public class ModiscoFacetException extends Exception {

 

 	/**

-	 * 

+	 *

 	 */

 	private static final long serialVersionUID = -4130168457242723140L;

 

 	/**

-	 * 

+	 *

 	 */

 	public ModiscoFacetException() {

 		super();

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java
index e83537983..c3d4b177c 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/exception/StructuralConstraintViolationException.java
@@ -18,12 +18,12 @@ package org.eclipse.gmt.modisco.infra.facet.core.exception;
 public class StructuralConstraintViolationException extends ModiscoFacetException {

 

 	/**

-	 * 

+	 *

 	 */

 	private static final long serialVersionUID = -4130168457242723140L;

 

 	/**

-	 * 

+	 *

 	 */

 	public StructuralConstraintViolationException() {

 		super();

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java
index cc5fb128b..017a600d0 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/extensions/RefreshStrategy.java
@@ -26,7 +26,7 @@ public interface RefreshStrategy {
 	 * Facet may have changed. Since this method will be called for each change

 	 * in the model, it should be optimized to do the minimum amount of

 	 * computation possible while still returning an accurate result.

-	 * 

+	 *

 	 * @param eObject

 	 *            an EObject that changed

 	 * @param msg

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java
index 3da3e90c5..689f7099a 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -28,7 +28,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -41,7 +41,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -54,7 +54,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java
index 7d339343d..012815223 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetBuilder.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas BROS (Mia-Software)

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java
index 0ea129216..c22b4c0c4 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/FacetProtocolExtension.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -22,7 +22,7 @@ public class FacetProtocolExtension implements IModiscoProtocolExtension {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.gmt.modisco.infra.common.core.IModiscoResourceFactoryExt#

 	 * getSchemeSpecificPart()

 	 */

@@ -32,7 +32,7 @@ public class FacetProtocolExtension implements IModiscoProtocolExtension {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.gmt.modisco.infra.common.core.internal.IModiscoResourceFactoryExt#getURI

 	 * (java.lang.String)

diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java
index 8844b313f..535ececd6 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/internal/utils/QueryToFacetSet.java
@@ -6,9 +6,9 @@ package org.eclipse.gmt.modisco.infra.facet.core.internal.utils;
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 

@@ -33,11 +33,11 @@ import org.eclipse.gmt.modisco.infra.query.ModelQuerySet;
  * This Class perform a model transformation from a QuerySet File to a FaceSet

  * one Query concerned are those whithout paremeters which return type is

  * EBoolean

- * 

+ *

  * NsUri is generated using the static field nsUri concatenated with the

  * querySet's name facet's name in the FacetSet are directly their corresponding

  * name in the QuerySet

- * 

+ *

  * @deprecated Replaced by EMF Facet

  */

 @Deprecated

@@ -81,7 +81,7 @@ public final class QueryToFacetSet {
 	/**

 	 * This method visits all the contained ModelQuerySet (usually one) and

 	 * creates a FacetSet before visiting every contained Facet

-	 * 

+	 *

 	 * @param facetSet

 	 *            the targeted facetSet

 	 * @param resourceQuery

@@ -109,7 +109,7 @@ public final class QueryToFacetSet {
 

 	/**

 	 * This Method buils a Facet based on the information contained in the query

-	 * 

+	 *

 	 * @param query

 	 *            the visited query used to build a new facet

 	 * @param facetSet

@@ -128,7 +128,7 @@ public final class QueryToFacetSet {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param sourceURI

 	 *            the URI where the is to be saved

 	 * @param resource

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/.checkstyle b/org.eclipse.gmt.modisco.infra.facet.edit/.checkstyle
index 585b0d4b9..699104fb8 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/.checkstyle
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/facet/edit/provider"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/.classpath b/org.eclipse.gmt.modisco.infra.facet.edit/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/.classpath
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/build.properties b/org.eclipse.gmt.modisco.infra.facet.edit/build.properties
index 0f0f323e5..f75ae6258 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/build.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/build.properties
@@ -8,6 +8,7 @@
 # Contributors:

 #     Frederic Madiot (Mia-Software) - meta-model design

 #     Gregoire DUPE (Mia-Software) - design and implementation

+#	  Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                icons/,\

@@ -16,7 +17,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html,\

                FacetIcons.xcf

diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java
index fe222cc7b..fe222cc7b 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetAttributeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java
index 372cf9fbd..372cf9fbd 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetEditPlugin.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java
index 84da7688c..84da7688c 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java
index 042dd1de8..042dd1de8 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java
index d60e960a2..d60e960a2 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetReferenceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java
index b8512d28a..b8512d28a 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetSetItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java
index 9d0fd5302..9d0fd5302 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/FacetStructuralFeatureItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java
index 1dfe48681..1dfe48681 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/src/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/src-gen/org/eclipse/gmt/modisco/infra/facet/edit/provider/ShortcutItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/.checkstyle b/org.eclipse.gmt.modisco.infra.facet.editor/.checkstyle
index c000d81b5..2638c0b1f 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/.checkstyle
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/facet/editor/presentation"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/.classpath b/org.eclipse.gmt.modisco.infra.facet.editor/.classpath
index 45f024e85..afb9bb46e 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/.classpath
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/build.properties b/org.eclipse.gmt.modisco.infra.facet.editor/build.properties
index 22b129c2a..b96081cde 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/build.properties
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/build.properties
@@ -8,6 +8,7 @@
 # Contributors:

 #     Frederic Madiot (Mia-Software) - meta-model design

 #     Gregoire DUPE (Mia-Software) - design and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                icons/,\

@@ -16,6 +17,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/,\

+           src/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java
index e937c6416..e937c6416 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetActionBarContributor.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java
index d5773699e..d5773699e 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditor.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java
index 46e55c8ea..46e55c8ea 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetEditorPlugin.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java
index f91e07f68..f91e07f68 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/FacetModelWizard.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java
index c300c61fc..c300c61fc 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMetaModelResourceAction.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java
index 923ce77fa..923ce77fa 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/src/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/src-gen/org/eclipse/gmt/modisco/infra/facet/editor/presentation/LoadMoDiscoResourceAction.java
diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/.checkstyle b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/.checkstyle
index 76d3f9035..e69aca1c1 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java
index 9c7f743e7..14f937cdd 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/src/org/eclipse/gmt/modisco/infra/facet/examples/kdm/Activator.java
@@ -40,7 +40,7 @@ public class Activator extends Plugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getDefault() {
diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/.checkstyle b/org.eclipse.gmt.modisco.infra.facet.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java
index dbabd87f9..1ec9f6f95 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/src/org/eclipse/gmt/modisco/infra/facet/ui/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas BROS (Mia-Software)

@@ -31,7 +31,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -44,7 +44,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -57,7 +57,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.facet/.checkstyle b/org.eclipse.gmt.modisco.infra.facet/.checkstyle
index 98a274fb1..699104fb8 100644
--- a/org.eclipse.gmt.modisco.infra.facet/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.facet/.checkstyle
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/facet"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/facet/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/facet/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.facet/.classpath b/org.eclipse.gmt.modisco.infra.facet/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.infra.facet/.classpath
+++ b/org.eclipse.gmt.modisco.infra.facet/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.infra.facet/build.properties b/org.eclipse.gmt.modisco.infra.facet/build.properties
index 914ec7aab..280efb25b 100644
--- a/org.eclipse.gmt.modisco.infra.facet/build.properties
+++ b/org.eclipse.gmt.modisco.infra.facet/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009, 2011 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -15,6 +16,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.infra.facet/model/facet.genmodel b/org.eclipse.gmt.modisco.infra.facet/model/facet.genmodel
index 76b4aa97d..88e470221 100644
--- a/org.eclipse.gmt.modisco.infra.facet/model/facet.genmodel
+++ b/org.eclipse.gmt.modisco.infra.facet/model/facet.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

- Copyright (c) 2009 Mia-Software.

+ Copyright (c) 2009, 2018 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

@@ -10,14 +10,17 @@
      Frederic Madiot (Mia-Software) - meta-model design

      Gregoire DUPE (Mia-Software) - design and implementation

      Nicolas BROS (Mia-Software)

+ 	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 -->

 <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="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;    Frederic Madiot (Mia-Software) - meta-model design&#xD;&#xA;    Gregoire DUPE (Mia-Software) - design and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.gmt.modisco.infra.facet/src" modelPluginID="org.eclipse.gmt.modisco.infra.facet"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;    Frederic Madiot (Mia-Software) - meta-model design&#xD;&#xA;    Gregoire DUPE (Mia-Software) - design and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.gmt.modisco.infra.facet/src-gen"  editDirectory="/org.eclipse.gmt.modisco.infra.facet.edit/src-gen"

+    editorDirectory="/org.eclipse.gmt.modisco.infra.facet.editor/src-gen" modelPluginID="org.eclipse.gmt.modisco.infra.facet"

     modelName="Facet" editPluginClass="org.eclipse.gmt.modisco.infra.facet.edit.provider.FacetEditPlugin"

     editorPluginClass="org.eclipse.gmt.modisco.infra.facet.editor.presentation.FacetEditorPlugin"

-    testSuiteClass="org.eclipse.gmt.modisco.infra.facet.tests.emf.FacetAllTests" importerID="org.eclipse.emf.importer.ecore"

+    testsDirectory="/org.eclipse.modisco.infra.facet.tests/src-gen" testSuiteClass="org.eclipse.modisco.infra.facet.tests.emf.FacetAllTests" 

+    testsPluginID="org.eclipse.modisco.infra.facet.tests" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="6.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.gmt.modisco.infra.query/model/query.genmodel#//query">

   <foreignModel>facet.ecore</foreignModel>

   <genPackages prefix="Facet" basePackage="org.eclipse.gmt.modisco.infra" disposableProviderFactory="true"

diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Facet.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/Facet.java
index 24f5a8f3f..24f5a8f3f 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Facet.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/Facet.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java
index 5ff438a85..5ff438a85 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetAttribute.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java
index d897d98bb..d897d98bb 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java
index 11f99d3cd..11f99d3cd 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetPackage.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetReference.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetReference.java
index 512cd653c..512cd653c 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetReference.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetReference.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetSet.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetSet.java
index 56c2b99fe..56c2b99fe 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetSet.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetSet.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java
index 14c74cc47..14c74cc47 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/FacetStructuralFeature.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Shortcut.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/Shortcut.java
index 893c10a08..893c10a08 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/Shortcut.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/Shortcut.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java
index 17818aa29..17818aa29 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java
index 17f8550b3..17f8550b3 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java
index 49943f701..49943f701 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java
index 7932cd7d1..7932cd7d1 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java
index e458c63b6..e458c63b6 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetReferenceImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java
index 6df753fd9..6df753fd9 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetSetImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java
index a59d9e7e0..a59d9e7e0 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/FacetStructuralFeatureImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java
index 998db721a..998db721a 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/impl/ShortcutImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java
index 14ac811e1..14ac811e1 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/plugin/FacetPlugin.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java
index 73ac427c9..73ac427c9 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/util/FacetAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java
index 64a43a84e..64a43a84e 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/util/FacetSwitch.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java
index 14f364e19..14f364e19 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/EValidatorAdapter.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java
index 0eb2f232f..0eb2f232f 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/ExtendedClassValidation.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java
index efa3dbcef..efa3dbcef 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetName.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java
index 55532ef00..55532ef00 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/FacetSetRoot.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java
index 1b7481a9c..1b7481a9c 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/NonEmptyName.java
diff --git a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java
index dc02ae609..dc02ae609 100644
--- a/org.eclipse.gmt.modisco.infra.facet/src/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java
+++ b/org.eclipse.gmt.modisco.infra.facet/src-gen/org/eclipse/gmt/modisco/infra/facet/validation/UniqueName.java
diff --git a/org.eclipse.gmt.modisco.infra.prefuse/.checkstyle b/org.eclipse.gmt.modisco.infra.prefuse/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.gmt.modisco.infra.prefuse/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java
index b4b9e0617..e26abb8c7 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/Activator.java
@@ -27,7 +27,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/PrefuseGraphContainer.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/PrefuseGraphContainer.java
index 22ef4919c..8b94abdd0 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/PrefuseGraphContainer.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/PrefuseGraphContainer.java
@@ -56,25 +56,25 @@ public class PrefuseGraphContainer {
 

 	private static PrefuseGraphContainer instance = new PrefuseGraphContainer();

 	protected PrefuseGraphContainer() {

-		

+

 	}

-	

+

 	public static PrefuseGraphContainer getInstance() {

 		return PrefuseGraphContainer.instance;

 	}

-	

+

 	/**

 	 * From a prefuse graph, it initializes a TreeView container,

 	 * composed of a tree (deduced from graph informations, so the

 	 * graph shall not contain cyclic links, in this case you should

 	 * use the initializeRadialGraphViewContainer method instead), a search

-	 * area and custom navigation (left click on an element will center 

+	 * area and custom navigation (left click on an element will center

 	 * the view on it, right click will zoom out to fit the graph into

 	 * the window, left press and move will move the graph, etc.).

-	 * 

+	 *

 	 * To encapsulate the swing component into an SWT component,

 	 * use provided method createPartControl(Composite parent, JPanel treeview)

-	 * 

+	 *

 	 * @param graph informations to build the tree

 	 * @param label the name of the attribute which will be used to render text of nodes

 	 * @return a swing panel which encapsulate tree view

@@ -88,13 +88,13 @@ public class PrefuseGraphContainer {
 	 * composed of a tree (deduced from graph informations, so the

 	 * graph shall not contain cyclic links, in this case you should

 	 * use the initializeRadialGraphViewContainer method instead), a search

-	 * area and custom navigation (left click on an element will center 

+	 * area and custom navigation (left click on an element will center

 	 * the view on it, right click will zoom out to fit the graph into

 	 * the window, left press and move will move the graph, etc.).

-	 * 

+	 *

 	 * To encapsulate the swing component into an SWT component,

 	 * use provided method createPartControl(Composite parent, JPanel treeview)

-	 * 

+	 *

 	 * @param graph informations to build the tree

 	 * @param label the name of the attribute which will be used to render text of nodes

 	 * @param image the name of the attribute which will be used to render image of nodes

@@ -108,7 +108,7 @@ public class PrefuseGraphContainer {
         final TreeView tview = new TreeView(graph, label, image);

         tview.setBackground(BACKGROUND);

         tview.setForeground(FOREGROUND);

-        

+

         // create a search panel for the tree map

         JSearchPanel search = new JSearchPanel(tview.getVisualization(),

         		TreeViewConstants.treeNodes, Visualization.SEARCH_ITEMS, label, true, true);

@@ -117,7 +117,7 @@ public class PrefuseGraphContainer {
         search.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 11)); //$NON-NLS-1$

         search.setBackground(BACKGROUND);

         search.setForeground(FOREGROUND);

-        

+

         final JFastLabel title = new JFastLabel("                 "); //$NON-NLS-1$

         title.setPreferredSize(new Dimension(350, 20));

         title.setVerticalAlignment(SwingConstants.BOTTOM);

@@ -125,7 +125,7 @@ public class PrefuseGraphContainer {
         title.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 16)); //$NON-NLS-1$

         title.setBackground(BACKGROUND);

         title.setForeground(FOREGROUND);

-        

+

         tview.addControlListener(new ControlAdapter() {

             public void itemEntered(VisualItem item, MouseEvent e) {

                 if ( item.canGetString(label) )

@@ -145,7 +145,7 @@ public class PrefuseGraphContainer {
         box.add(search);

         box.add(Box.createHorizontalStrut(3));

         box.setBackground(BACKGROUND);

-        

+

         JPanel panel = new JPanel(new BorderLayout());

         panel.setBackground(BACKGROUND);

         panel.setForeground(FOREGROUND);

@@ -153,46 +153,46 @@ public class PrefuseGraphContainer {
         panel.add(box, BorderLayout.SOUTH);

         return panel;

     }

-    

+

 	/**

 	 * From a prefuse graph, it initializes a RadialGraphView container,

 	 * composed of a radial graph (deduced from graph informations), a search

-	 * area and custom navigation (left click on an element will center 

+	 * area and custom navigation (left click on an element will center

 	 * the view on it, right click will zoom out to fit the graph into

 	 * the window, left press and move will move the graph, etc.).

-	 * 

+	 *

 	 * To encapsulate the swing component into an SWT component,

 	 * use provided method createPartControl(Composite parent, JPanel treeview)

-	 * 

+	 *

 	 * @param graph informations to build the radial graph

 	 * @param label the name of the attribute which will be used to render text of nodes

 	 * @return a swing panel which encapsulate radial graph view

 	 */

-	public JPanel initializeRadialGraphViewContainer(Graph graph, final String label) {        

+	public JPanel initializeRadialGraphViewContainer(Graph graph, final String label) {

 	    JPanel result = this.initializeRadialGraphViewContainer(graph, label, null);

 	    return result;

 	}

-	

+

 	/**

 	 * From a prefuse graph, it initializes a RadialGraphView container,

 	 * composed of a radial graph (deduced from graph informations), a search

-	 * area and custom navigation (left click on an element will center 

+	 * area and custom navigation (left click on an element will center

 	 * the view on it, right click will zoom out to fit the graph into

 	 * the window, left press and move will move the graph, etc.).

-	 * 

+	 *

 	 * To encapsulate the swing component into an SWT component,

 	 * use provided method createPartControl(Composite parent, JPanel treeview)

-	 * 

+	 *

 	 * @param graph informations to build the radial graph

 	 * @param label the name of the attribute which will be used to render text of nodes

 	 * @param controlAdapter to add a specific listener on radial graph view

 	 * @return a swing panel which encapsulate radial graph view

 	 */

-	public JPanel initializeRadialGraphViewContainer(Graph graph, final String label, Control controlAdapter) {        

+	public JPanel initializeRadialGraphViewContainer(Graph graph, final String label, Control controlAdapter) {

         // create a new radial tree view

         final RadialGraphView gview = new RadialGraphView(graph, label);

         Visualization vis = gview.getVisualization();

-        

+

         // create a search panel for the tree map

         SearchQueryBinding sq = new SearchQueryBinding(

              (Table)vis.getGroup(RadialGraphViewConstants.treeNodes), label,

@@ -201,13 +201,13 @@ public class PrefuseGraphContainer {
         search.setShowResultCount(true);

         search.setBorder(BorderFactory.createEmptyBorder(5,5,4,0));

         search.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 11)); //$NON-NLS-1$

-        

+

         final JFastLabel title = new JFastLabel("                 "); //$NON-NLS-1$

         title.setPreferredSize(new Dimension(350, 20));

         title.setVerticalAlignment(SwingConstants.BOTTOM);

         title.setBorder(BorderFactory.createEmptyBorder(3,0,0,0));

         title.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 16)); //$NON-NLS-1$

-        

+

         gview.addControlListener(new ControlAdapter() {

             public void itemEntered(VisualItem item, MouseEvent e) {

                 if ( item.canGetString(label) )

@@ -220,61 +220,61 @@ public class PrefuseGraphContainer {
         if (controlAdapter != null) {

         	gview.addControlListener(controlAdapter);

         }

-        

+

         Box box = new Box(BoxLayout.X_AXIS);

         box.add(Box.createHorizontalStrut(10));

         box.add(title);

         box.add(Box.createHorizontalGlue());

         box.add(search);

         box.add(Box.createHorizontalStrut(3));

-        

+

         JPanel panel = new JPanel(new BorderLayout());

         panel.add(gview, BorderLayout.CENTER);

         panel.add(box, BorderLayout.SOUTH);

-        

+

         Color BACKGROUND = Color.WHITE;

         Color FOREGROUND = Color.DARK_GRAY;

         UILib.setColor(panel, BACKGROUND, FOREGROUND);

-        

+

         return panel;

     }

-	

+

 	/**

 	 * From a prefuse graph, it initializes a GraphView container,

 	 * composed of a radial graph (deduced from graph informations), a search

-	 * area and custom navigation (left click on an element will center 

+	 * area and custom navigation (left click on an element will center

 	 * the view on it, right click will zoom out to fit the graph into

 	 * the window, left press and move will move the graph, etc.).

-	 * 

+	 *

 	 * To encapsulate the swing component into an SWT component,

 	 * use provided method createPartControl(Composite parent, JPanel treeview)

-	 * 

+	 *

 	 * @param graph informations to build the radial graph

 	 * @param label the name of the attribute which will be used to render text of nodes

 	 * @return a swing panel which encapsulate radial graph view

 	 */

-	public JPanel initializeGraphViewContainer(Graph graph, final String label) {        

+	public JPanel initializeGraphViewContainer(Graph graph, final String label) {

 	    JPanel result = this.initializeGraphViewContainer(graph, label, null);

 	    return result;

 	}

-	

+

 	/**

 	 * From a prefuse graph, it initializes a GraphView container,

 	 * composed of a radial graph (deduced from graph informations), a search

-	 * area and custom navigation (left click on an element will center 

+	 * area and custom navigation (left click on an element will center

 	 * the view on it, right click will zoom out to fit the graph into

 	 * the window, left press and move will move the graph, etc.).

-	 * 

+	 *

 	 * To encapsulate the swing component into an SWT component,

 	 * use provided method createPartControl(Composite parent, JPanel treeview)

-	 * 

+	 *

 	 * @param graph informations to build the radial graph

 	 * @param label the name of the attribute which will be used to render text of nodes

 	 * @param controlAdapter to add a specific listener on radial graph view

 	 * @return a swing panel which encapsulate radial graph view

 	 */

 	@SuppressWarnings("serial")

-	public JPanel initializeGraphViewContainer(Graph graph, final String label, Control controlAdapter) {        

+	public JPanel initializeGraphViewContainer(Graph graph, final String label, Control controlAdapter) {

 		final GraphView view = new GraphView(graph, label);

 		if (controlAdapter != null) {

 			view.addControlListener(controlAdapter);

@@ -316,7 +316,7 @@ public class PrefuseGraphContainer {
         panel.add(view, BorderLayout.CENTER);

 		return panel;

     }

-	

+

 	/**

 	 * To embed a Swing component into an SWT component.

 	 * @param parent

@@ -325,7 +325,7 @@ public class PrefuseGraphContainer {
 	public void createPartControl(Composite parent, JPanel treeview) {

 		Composite composite = new Composite(parent, SWT.EMBEDDED | SWT.NO_BACKGROUND);

 	    Frame frame = SWT_AWT.new_Frame(composite);

-	    

+

         frame.add(treeview);

 	}

 }

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/FitOverviewListener.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/FitOverviewListener.java
index ad8987ef9..b3113da72 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/FitOverviewListener.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/FitOverviewListener.java
@@ -29,7 +29,7 @@ public class FitOverviewListener implements ItemBoundsListener {
     public void itemBoundsChanged(Display d) {

         d.getItemBounds(this.m_temp);

         GraphicsLib.expand(this.m_temp, 25/d.getScale());

-        

+

         double dd = this.m_d/d.getScale();

         double xd = Math.abs(this.m_temp.getMinX()-this.m_bounds.getMinX());

         double yd = Math.abs(this.m_temp.getMinY()-this.m_bounds.getMinY());

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphView.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphView.java
index 6d0119d40..a748c3ad6 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphView.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphView.java
@@ -39,25 +39,25 @@ import prefuse.visual.VisualItem;
 

 @SuppressWarnings("serial")

 public class GraphView extends Display {

-	

+

     public GraphView(Graph g, String label) {

     	super(new Visualization());

-    	

+

         // --------------------------------------------------------------------

         // set up the renderers

-        

+

         LabelRenderer tr = new LabelRenderer();

         tr.setRoundedCorner(8, 8);

         this.m_vis.setRendererFactory(new DefaultRendererFactory(tr));

 

         // --------------------------------------------------------------------

         // register the data with a visualization

-        

+

         // adds graph to visualization and sets renderer label field

         setGraph(g, label);

-        

+

         // fix selected focus nodes

-        TupleSet focusGroup = this.m_vis.getGroup(Visualization.FOCUS_ITEMS); 

+        TupleSet focusGroup = this.m_vis.getGroup(Visualization.FOCUS_ITEMS);

         focusGroup.addTupleSetListener(new TupleSetListener() {

             public void tupleSetChanged(TupleSet ts, Tuple[] add, Tuple[] rem)

             {

@@ -83,20 +83,20 @@ public class GraphView extends Display {
                 GraphView.this.m_vis.run("draw"); //$NON-NLS-1$

             }

         });

-        

-        

-        

+

+

+

         // --------------------------------------------------------------------

         // create actions to process the visual data

 

 //        int hops = 30;

 //        final GraphDistanceFilter filter = new GraphDistanceFilter(GraphViewConstants.graph, hops);

 

-        ColorAction fill = new ColorAction(GraphViewConstants.nodes, 

+        ColorAction fill = new ColorAction(GraphViewConstants.nodes,

                 VisualItem.FILLCOLOR, ColorLib.rgb(200,200,255));

         fill.add(VisualItem.FIXED, ColorLib.rgb(255,100,100));

         fill.add(VisualItem.HIGHLIGHT, ColorLib.rgb(255,200,125));

-        

+

         ActionList draw = new ActionList();

 //        draw.add(filter);

         draw.add(fill);

@@ -104,18 +104,18 @@ public class GraphView extends Display {
         draw.add(new ColorAction(GraphViewConstants.nodes, VisualItem.TEXTCOLOR, ColorLib.rgb(0,0,0)));

         draw.add(new ColorAction(GraphViewConstants.edges, VisualItem.FILLCOLOR, ColorLib.gray(200)));

         draw.add(new ColorAction(GraphViewConstants.edges, VisualItem.STROKECOLOR, ColorLib.gray(200)));

-        

+

         // create the tree layout action

         RadialTreeLayout treeLayout = new RadialTreeLayout(GraphViewConstants.graph);

         //treeLayout.setAngularBounds(-Math.PI/2, Math.PI);

         this.m_vis.putAction("treeLayout", treeLayout); //$NON-NLS-1$

-        

+

         ActionList animate = new ActionList(Activity.INFINITY);

         //animate.add(new ForceDirectedLayout(GraphViewConstants.graph));

         animate.add(treeLayout);

         animate.add(fill);

         animate.add(new RepaintAction());

-        

+

         // finally, we register our ActionList with the Visualization.

         // we can later execute our Actions by invoking a method on our

         // Visualization, using the name we've chosen below.

@@ -123,16 +123,16 @@ public class GraphView extends Display {
         this.m_vis.putAction("layout", animate); //$NON-NLS-1$

 

         this.m_vis.runAfter("draw", "layout"); //$NON-NLS-1$ //$NON-NLS-2$

-        

-        

+

+

         // --------------------------------------------------------------------

         // set up a display to show the visualization

-        

+

         this.setSize(700,700);

         this.pan(350, 350);

         this.setForeground(Color.GRAY);

         this.setBackground(Color.WHITE);

-        

+

         // main display controls

         this.addControlListener(new FocusControl(1));

         this.addControlListener(new DragControl());

@@ -141,17 +141,17 @@ public class GraphView extends Display {
         this.addControlListener(new WheelZoomControl());

         this.addControlListener(new ZoomToFitControl());

         this.addControlListener(new NeighborHighlightControl());

-        

+

         this.setForeground(Color.GRAY);

         this.setBackground(Color.WHITE);

-        

-        // --------------------------------------------------------------------        

+

+        // --------------------------------------------------------------------

         // launch the visualization

-        

+

         // create a panel for editing force values

 //        ForceSimulator fsim = ((ForceDirectedLayout)animate.get(0)).getForceSimulator();

 //        JForcePanel fpanel = new JForcePanel(fsim);

-//             

+//

 //        final JValueSlider slider = new JValueSlider("Distance", 0, hops, hops);

 //        slider.addChangeListener(new ChangeListener() {

 //            public void stateChanged(ChangeEvent e) {

@@ -162,14 +162,14 @@ public class GraphView extends Display {
 //        slider.setBackground(Color.WHITE);

 //        slider.setPreferredSize(new Dimension(300,30));

 //        slider.setMaximumSize(new Dimension(300,30));

-//        

+//

 //        Box cf = new Box(BoxLayout.Y_AXIS);

 //        cf.add(slider);

 //        cf.setBorder(BorderFactory.createTitledBorder("Connectivity Filter"));

 //        fpanel.add(cf);

-//        

+//

 //        fpanel.add(Box.createVerticalGlue());

-//        

+//

 //        // create a new JSplitPane to present the interface

 //        JSplitPane split = new JSplitPane();

 //        split.setLeftComponent(display);

@@ -177,19 +177,19 @@ public class GraphView extends Display {
 //        split.setOneTouchExpandable(true);

 //        split.setContinuousLayout(false);

 //        split.setDividerLocation(700);

-        

+

         // now we run our action list

         this.m_vis.run("draw"); //$NON-NLS-1$

-        

+

 //        this.add(split);

     }

-    

+

     public void setGraph(Graph g, String label) {

         // update labeling

         DefaultRendererFactory drf = (DefaultRendererFactory)

                                                 this.m_vis.getRendererFactory();

         ((LabelRenderer)drf.getDefaultRenderer()).setTextField(label);

-        

+

         // update graph

         this.m_vis.removeGroup(GraphViewConstants.graph);

         VisualGraph vg = this.m_vis.addGraph(GraphViewConstants.graph, g);

@@ -198,5 +198,5 @@ public class GraphView extends Display {
         this.m_vis.getGroup(Visualization.FOCUS_ITEMS).setTuple(f);

         f.setFixed(false);

     }

-        

+

 } // end of class GraphView

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewConstants.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewConstants.java
index 7295d87cb..feca91fa8 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewConstants.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewConstants.java
@@ -16,5 +16,5 @@ public interface GraphViewConstants {
     static final String nodes = "graph.nodes"; //$NON-NLS-1$

     static final String edges = "graph.edges"; //$NON-NLS-1$

     static final String draw = "draw"; //$NON-NLS-1$

-    

+

 }

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewUtils.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewUtils.java
index 00efb1ee1..0e30ef49f 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewUtils.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/GraphViewUtils.java
@@ -23,14 +23,14 @@ import prefuse.util.GraphLib;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 @SuppressWarnings("serial")

 public class GraphViewUtils {

 

 	public static JFrame demo(Graph g, String label) {

 		final GraphView view = new GraphView(g, label);

-		

+

 		// set up menu

 		JMenu dataMenu = new JMenu(Messages.GraphViewUtils_Data);

 		dataMenu.add(new OpenGraphAction(view));

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/OpenGraphAction.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/OpenGraphAction.java
index cce3d887b..c701f0eb5 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/OpenGraphAction.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/graphview/OpenGraphAction.java
@@ -67,7 +67,7 @@ public class OpenGraphAction extends AbstractAction {
         String[] names = new String[cc];

         for ( int i=0; i<cc; ++i )

             names[i] = t.getColumnName(i);

-        

+

         // where to store the result

         final String[] label = new String[1];

 

@@ -78,7 +78,7 @@ public class OpenGraphAction extends AbstractAction {
         }

         final JDialog dialog = new JDialog(

                 (JFrame)c, Messages.OpenGraphAction_ChooseLabelField, true);

-        

+

         // create the ok/cancel buttons

         final JButton ok = new JButton(Messages.OpenGraphAction_OK);

         ok.setEnabled(false);

@@ -94,14 +94,14 @@ public class OpenGraphAction extends AbstractAction {
                 dialog.setVisible(false);

             }

         });

-        

+

         // build the selection list

         final JList list = new JList(names);

         list.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

         list.getSelectionModel().addListSelectionListener(

         new ListSelectionListener() {

             public void valueChanged(ListSelectionEvent e) {

-                int sel = list.getSelectedIndex(); 

+                int sel = list.getSelectedIndex();

                 if ( sel >= 0 ) {

                     ok.setEnabled(true);

                     label[0] = (String)list.getModel().getElementAt(sel);

@@ -112,9 +112,9 @@ public class OpenGraphAction extends AbstractAction {
             }

         });

         JScrollPane scrollList = new JScrollPane(list);

-        

+

         JLabel title = new JLabel(Messages.OpenGraphAction_ChooseFieldToUseForNodeLabels);

-        

+

         // layout the buttons

         Box bbox = new Box(BoxLayout.X_AXIS);

         bbox.add(Box.createHorizontalStrut(5));

@@ -123,21 +123,21 @@ public class OpenGraphAction extends AbstractAction {
         bbox.add(Box.createHorizontalStrut(5));

         bbox.add(cancel);

         bbox.add(Box.createHorizontalStrut(5));

-        

+

         // put everything into a panel

         JPanel panel = new JPanel(new BorderLayout());

         panel.add(title, BorderLayout.NORTH);

         panel.add(scrollList, BorderLayout.CENTER);

         panel.add(bbox, BorderLayout.SOUTH);

         panel.setBorder(BorderFactory.createEmptyBorder(5,2,2,2));

-        

+

         // show the dialog

         dialog.setContentPane(panel);

         dialog.pack();

         dialog.setLocationRelativeTo(c);

         dialog.setVisible(true);

         dialog.dispose();

-        

+

         // return the label field selection

         return label[0];

     }

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/NodeColorAction.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/NodeColorAction.java
index 4cb538fdd..91128bb1c 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/NodeColorAction.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/NodeColorAction.java
@@ -25,5 +25,5 @@ public class NodeColorAction extends ColorAction {
         add("ingroup('_search_')", ColorLib.rgb(255,190,190)); //$NON-NLS-1$

         add("ingroup('_focus_')", ColorLib.rgb(198,229,229)); //$NON-NLS-1$

     }

-            

+

 }
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphView.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphView.java
index 08ea34879..6e9d3f57a 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphView.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphView.java
@@ -61,9 +61,9 @@ public class RadialGraphView extends Display {
 

     private LabelRenderer m_nodeRenderer;

     private EdgeRenderer m_edgeRenderer;

-    

+

     private String m_label = "label"; //$NON-NLS-1$

-    

+

     public RadialGraphView(Graph g, String label) {

         super(new Visualization());

         this.m_label = label;

@@ -71,58 +71,58 @@ public class RadialGraphView extends Display {
         // -- set up visualization --

         this.m_vis.add(RadialGraphViewConstants.tree, g);

         this.m_vis.setInteractive(RadialGraphViewConstants.treeEdges, null, false);

-        

+

         // -- set up renderers --

         this.m_nodeRenderer = new LabelRenderer(this.m_label);

         this.m_nodeRenderer.setRenderType(AbstractShapeRenderer.RENDER_TYPE_FILL);

         this.m_nodeRenderer.setHorizontalAlignment(Constants.CENTER);

         this.m_nodeRenderer.setRoundedCorner(8,8);

         this.m_edgeRenderer = new EdgeRenderer();

-        

+

         DefaultRendererFactory rf = new DefaultRendererFactory(this.m_nodeRenderer);

         rf.add(new InGroupPredicate(RadialGraphViewConstants.treeEdges), this.m_edgeRenderer);

         this.m_vis.setRendererFactory(rf);

-               

+

         // -- set up processing actions --

-        

+

         // colors

         ItemAction nodeColor = new NodeColorAction(RadialGraphViewConstants.treeNodes);

         ItemAction textColor = new TextColorAction(RadialGraphViewConstants.treeNodes);

         this.m_vis.putAction("textColor", textColor); //$NON-NLS-1$

-        

+

         ItemAction edgeColor = new ColorAction(RadialGraphViewConstants.treeEdges,

                 VisualItem.STROKECOLOR, ColorLib.rgb(200,200,200));

-        

-        FontAction fonts = new FontAction(RadialGraphViewConstants.treeNodes, 

+

+        FontAction fonts = new FontAction(RadialGraphViewConstants.treeNodes,

                 FontLib.getFont("Tahoma", 10)); //$NON-NLS-1$

         fonts.add("ingroup('_focus_')", FontLib.getFont("Tahoma", 11)); //$NON-NLS-1$ //$NON-NLS-2$

-        

+

         // recolor

         ActionList recolor = new ActionList();

         recolor.add(nodeColor);

         recolor.add(textColor);

         this.m_vis.putAction("recolor", recolor); //$NON-NLS-1$

-        

+

         // repaint

         ActionList repaint = new ActionList();

         repaint.add(recolor);

         repaint.add(new RepaintAction());

         this.m_vis.putAction("repaint", repaint); //$NON-NLS-1$

-        

+

         // animate paint change

         ActionList animatePaint = new ActionList(400);

         animatePaint.add(new ColorAnimator(RadialGraphViewConstants.treeNodes));

         animatePaint.add(new RepaintAction());

         this.m_vis.putAction("animatePaint", animatePaint); //$NON-NLS-1$

-        

+

         // create the tree layout action

         RadialTreeLayout treeLayout = new RadialTreeLayout(RadialGraphViewConstants.tree);

         //treeLayout.setAngularBounds(-Math.PI/2, Math.PI);

         this.m_vis.putAction("treeLayout", treeLayout); //$NON-NLS-1$

-        

+

         CollapsedSubtreeLayout subLayout = new CollapsedSubtreeLayout(RadialGraphViewConstants.tree);

         this.m_vis.putAction("subLayout", subLayout); //$NON-NLS-1$

-        

+

         // create the filtering and layout

         ActionList filter = new ActionList();

         filter.add(new TreeRootAction(RadialGraphViewConstants.tree));

@@ -133,7 +133,7 @@ public class RadialGraphView extends Display {
         filter.add(nodeColor);

         filter.add(edgeColor);

         this.m_vis.putAction("filter", filter); //$NON-NLS-1$

-        

+

         // animated transition

         ActionList animate = new ActionList(1250);

         animate.setPacingFunction(new SlowInSlowOutPacer());

@@ -144,9 +144,9 @@ public class RadialGraphView extends Display {
         animate.add(new RepaintAction());

         this.m_vis.putAction("animate", animate); //$NON-NLS-1$

         this.m_vis.alwaysRunAfter("filter", "animate"); //$NON-NLS-1$ //$NON-NLS-2$

-        

+

         // ------------------------------------------------

-        

+

         // initialize the display

         setSize(700,600);

         setItemSorter(new TreeDepthItemSorter());

@@ -156,12 +156,12 @@ public class RadialGraphView extends Display {
         addControlListener(new PanControl());

         addControlListener(new FocusControl(1, "filter")); //$NON-NLS-1$

         addControlListener(new HoverActionControl("repaint")); //$NON-NLS-1$

-        

+

         // ------------------------------------------------

-        

+

         // filter graph and perform layout

         this.m_vis.run("filter"); //$NON-NLS-1$

-        

+

         // maintain a set of items that should be interpolated linearly

         // this isn't absolutely necessary, but makes the animations nicer

         // the PolarLocationAnimator should read this set and act accordingly

@@ -177,7 +177,7 @@ public class RadialGraphView extends Display {
                 }

             }

         );

-        

+

         SearchTupleSet search = new PrefixSearchTupleSet();

         this.m_vis.addFocusGroup(Visualization.SEARCH_ITEMS, search);

         search.addTupleSetListener(new TupleSetListener() {

@@ -189,5 +189,5 @@ public class RadialGraphView extends Display {
             }

         });

     }

-    

+

 } // end of class RadialGraphView

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewConstants.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewConstants.java
index e8c305915..f124bfea9 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewConstants.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewConstants.java
@@ -16,5 +16,5 @@ public interface RadialGraphViewConstants {
     static final String treeNodes = "tree.nodes"; //$NON-NLS-1$

     static final String treeEdges = "tree.edges"; //$NON-NLS-1$

     static final String linear = "linear"; //$NON-NLS-1$

-    

+

 }

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewUtils.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewUtils.java
index baeda507c..b447a4ec2 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewUtils.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/RadialGraphViewUtils.java
@@ -38,7 +38,7 @@ import prefuse.visual.VisualItem;
 

 

 public class RadialGraphViewUtils {

-	

+

     public static JPanel demo(String datafile, final String label) {

         Graph g = null;

         try {

@@ -49,12 +49,12 @@ public class RadialGraphViewUtils {
         }

         return demo(g, label);

     }

-    

-    public static JPanel demo(Graph g, final String label) {        

+

+    public static JPanel demo(Graph g, final String label) {

         // create a new radial tree view

         final RadialGraphView gview = new RadialGraphView(g, label);

         Visualization vis = gview.getVisualization();

-        

+

         // create a search panel for the tree map

         SearchQueryBinding sq = new SearchQueryBinding(

              (Table)vis.getGroup(RadialGraphViewConstants.treeNodes), label,

@@ -63,13 +63,13 @@ public class RadialGraphViewUtils {
         search.setShowResultCount(true);

         search.setBorder(BorderFactory.createEmptyBorder(5,5,4,0));

         search.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 11)); //$NON-NLS-1$

-        

+

         final JFastLabel title = new JFastLabel("                 "); //$NON-NLS-1$

         title.setPreferredSize(new Dimension(350, 20));

         title.setVerticalAlignment(SwingConstants.BOTTOM);

         title.setBorder(BorderFactory.createEmptyBorder(3,0,0,0));

         title.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 16)); //$NON-NLS-1$

-        

+

         gview.addControlListener(new ControlAdapter() {

             public void itemEntered(VisualItem item, MouseEvent e) {

                 if ( item.canGetString(label) )

@@ -79,22 +79,22 @@ public class RadialGraphViewUtils {
                 title.setText(null);

             }

         });

-        

+

         Box box = new Box(BoxLayout.X_AXIS);

         box.add(Box.createHorizontalStrut(10));

         box.add(title);

         box.add(Box.createHorizontalGlue());

         box.add(search);

         box.add(Box.createHorizontalStrut(3));

-        

+

         JPanel panel = new JPanel(new BorderLayout());

         panel.add(gview, BorderLayout.CENTER);

         panel.add(box, BorderLayout.SOUTH);

-        

+

         Color BACKGROUND = Color.WHITE;

         Color FOREGROUND = Color.DARK_GRAY;

         UILib.setColor(panel, BACKGROUND, FOREGROUND);

-        

+

         return panel;

     }

 

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/TreeRootAction.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/TreeRootAction.java
index ae1b2f795..7008f5843 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/TreeRootAction.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/radialgraphview/TreeRootAction.java
@@ -31,7 +31,7 @@ public class TreeRootAction extends GroupAction {
     public void run(double frac) {

         TupleSet focus = this.m_vis.getGroup(Visualization.FOCUS_ITEMS);

         if ( focus==null || focus.getTupleCount() == 0 ) return;

-        

+

         Graph g = (Graph)this.m_vis.getGroup(this.m_group);

         Node f = null;

         Iterator<?> tuples = focus.tuples();

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/AutoPanAction.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/AutoPanAction.java
index 818731365..fa00f49c3 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/AutoPanAction.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/AutoPanAction.java
@@ -25,17 +25,17 @@ public class AutoPanAction extends Action {
     private Point2D m_end   = new Point2D.Double();

     private Point2D m_cur   = new Point2D.Double();

     private int     m_bias  = 150;

-    

+

     private final TreeView treeView;

     public AutoPanAction(TreeView treeViewParameter) {

     	this.treeView = treeViewParameter;

     }

-    

+

     public void run(double frac) {

         TupleSet ts = this.m_vis.getFocusGroup(Visualization.FOCUS_ITEMS);

         if ( ts.getTupleCount() == 0 )

             return;

-        

+

         if ( frac == 0.0 ) {

             int xbias=0, ybias=0;

             switch ( this.treeView.getOrientation() ) {

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/OrientAction.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/OrientAction.java
index f2fbc80ee..57642db67 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/OrientAction.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/OrientAction.java
@@ -18,7 +18,7 @@ import javax.swing.AbstractAction;
 @SuppressWarnings("serial")

 public class OrientAction extends AbstractAction {

     private int orientation;

-    

+

     private final TreeView treeView;

     public OrientAction(int orientation, TreeView treeViewParameter) {

         this.orientation = orientation;

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeView.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeView.java
index f5bbb9c29..a40fe7d16 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeView.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeView.java
@@ -61,71 +61,71 @@ import prefuse.visual.sort.TreeDepthItemSorter;
 @SuppressWarnings("serial")

 public class TreeView extends Display {

 

-    

-    

+

+

     private LabelRenderer m_nodeRenderer;

     private EdgeRenderer m_edgeRenderer;

-    

+

     private String m_label = "label"; //$NON-NLS-1$

     private String m_image = "image"; //$NON-NLS-1$

     private int m_orientation = Constants.ORIENT_LEFT_RIGHT;

-        

+

     public TreeView(Graph t, String label, String image) {

         super(new Visualization());

         this.m_label = label;

         this.m_image = image;

-        

+

         this.m_vis.add(TreeViewConstants.tree, t);

-        

+

         this.m_nodeRenderer = new LabelRenderer(this.m_label, this.m_image);

         this.m_nodeRenderer.setRenderType(AbstractShapeRenderer.RENDER_TYPE_FILL);

         this.m_nodeRenderer.setHorizontalAlignment(Constants.LEFT);

         this.m_nodeRenderer.setImagePosition(Constants.LEFT);

         this.m_nodeRenderer.setRoundedCorner(8,8);

         this.m_edgeRenderer = new EdgeRenderer(Constants.EDGE_TYPE_CURVE);

-        

+

         DefaultRendererFactory rf = new DefaultRendererFactory(this.m_nodeRenderer);

         rf.add(new InGroupPredicate(TreeViewConstants.treeEdges), this.m_edgeRenderer);

         this.m_vis.setRendererFactory(rf);

-               

+

         // colors

         ItemAction nodeColor = new NodeColorAction(TreeViewConstants.treeNodes);

         ItemAction textColor = new ColorAction(TreeViewConstants.treeNodes,

                 VisualItem.TEXTCOLOR, ColorLib.rgb(0,0,0));

         this.m_vis.putAction("textColor", textColor); //$NON-NLS-1$

-        

+

         ItemAction edgeColor = new ColorAction(TreeViewConstants.treeEdges,

                 VisualItem.STROKECOLOR, ColorLib.rgb(200,200,200));

-        

+

         // quick repaint

         ActionList repaint = new ActionList();

         repaint.add(nodeColor);

         repaint.add(new RepaintAction());

         this.m_vis.putAction("repaint", repaint); //$NON-NLS-1$

-        

+

         // full paint

         ActionList fullPaint = new ActionList();

         fullPaint.add(nodeColor);

         this.m_vis.putAction("fullPaint", fullPaint); //$NON-NLS-1$

-        

+

         // animate paint change

         ActionList animatePaint = new ActionList(400);

         animatePaint.add(new ColorAnimator(TreeViewConstants.treeNodes));

         animatePaint.add(new RepaintAction());

         this.m_vis.putAction("animatePaint", animatePaint); //$NON-NLS-1$

-        

+

         // create the tree layout action

         NodeLinkTreeLayout treeLayout = new NodeLinkTreeLayout(TreeViewConstants.tree,

                 this.m_orientation, 50, 0, 8);

         treeLayout.setLayoutAnchor(new Point2D.Double(25,300));

         this.m_vis.putAction("treeLayout", treeLayout); //$NON-NLS-1$

-        

-        CollapsedSubtreeLayout subLayout = 

+

+        CollapsedSubtreeLayout subLayout =

             new CollapsedSubtreeLayout(TreeViewConstants.tree, this.m_orientation);

         this.m_vis.putAction("subLayout", subLayout); //$NON-NLS-1$

-        

+

         AutoPanAction autoPan = new AutoPanAction(this);

-        

+

         // create the filtering and layout

         ActionList filter = new ActionList();

         filter.add(new FisheyeTreeFilter(TreeViewConstants.tree, 2));

@@ -136,7 +136,7 @@ public class TreeView extends Display {
         filter.add(nodeColor);

         filter.add(edgeColor);

         this.m_vis.putAction("filter", filter); //$NON-NLS-1$

-        

+

         // animated transition

         ActionList animate = new ActionList(1000);

         animate.setPacingFunction(new SlowInSlowOutPacer());

@@ -148,7 +148,7 @@ public class TreeView extends Display {
         animate.add(new RepaintAction());

         this.m_vis.putAction("animate", animate); //$NON-NLS-1$

         this.m_vis.alwaysRunAfter("filter", "animate"); //$NON-NLS-1$ //$NON-NLS-2$

-        

+

         // create animator for orientation changes

         ActionList orient = new ActionList(2000);

         orient.setPacingFunction(new SlowInSlowOutPacer());

@@ -157,9 +157,9 @@ public class TreeView extends Display {
         orient.add(new LocationAnimator(TreeViewConstants.treeNodes));

         orient.add(new RepaintAction());

         this.m_vis.putAction("orient", orient); //$NON-NLS-1$

-        

+

         // ------------------------------------------------

-        

+

         // initialize the display

         setSize(700,600);

         setItemSorter(new TreeDepthItemSorter());

@@ -168,7 +168,7 @@ public class TreeView extends Display {
         addControlListener(new WheelZoomControl());

         addControlListener(new PanControl());

         addControlListener(new FocusControl(1, "filter")); //$NON-NLS-1$

-        

+

         registerKeyboardAction(

             new OrientAction(Constants.ORIENT_LEFT_RIGHT, this),

             "left-to-right", KeyStroke.getKeyStroke("ctrl 1"), WHEN_FOCUSED); //$NON-NLS-1$ //$NON-NLS-2$

@@ -181,14 +181,14 @@ public class TreeView extends Display {
         registerKeyboardAction(

             new OrientAction(Constants.ORIENT_BOTTOM_TOP, this),

             "bottom-to-top", KeyStroke.getKeyStroke("ctrl 4"), WHEN_FOCUSED); //$NON-NLS-1$ //$NON-NLS-2$

-        

+

         // ------------------------------------------------

-        

+

         // filter graph and perform layout

         setOrientation(this.m_orientation);

         this.m_vis.run("filter"); //$NON-NLS-1$

-        

-        TupleSet search = new PrefixSearchTupleSet(); 

+

+        TupleSet search = new PrefixSearchTupleSet();

         this.m_vis.addFocusGroup(Visualization.SEARCH_ITEMS, search);

         search.addTupleSetListener(new TupleSetListener() {

             @SuppressWarnings("synthetic-access")

@@ -199,11 +199,11 @@ public class TreeView extends Display {
             }

         });

     }

-    

+

     // ------------------------------------------------------------------------

-    

+

     public void setOrientation(int orientation) {

-        NodeLinkTreeLayout rtl 

+        NodeLinkTreeLayout rtl

             = (NodeLinkTreeLayout)this.m_vis.getAction("treeLayout"); //$NON-NLS-1$

         CollapsedSubtreeLayout stl

             = (CollapsedSubtreeLayout)this.m_vis.getAction("subLayout"); //$NON-NLS-1$

@@ -244,16 +244,16 @@ public class TreeView extends Display {
         rtl.setOrientation(orientation);

         stl.setOrientation(orientation);

     }

-    

+

     public int getOrientation() {

         return this.m_orientation;

     }

-    

+

     // ------------------------------------------------------------------------

-       

-    

-    

+

+

+

     // ------------------------------------------------------------------------

-    

-    

+

+

 } // end of class TreeMap

diff --git a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeViewUtils.java b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeViewUtils.java
index c79fc74c3..320c840a1 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeViewUtils.java
+++ b/org.eclipse.gmt.modisco.infra.prefuse/src/org/eclipse/gmt/modisco/infra/prefuse/examples/treeview/TreeViewUtils.java
@@ -45,10 +45,10 @@ public class TreeViewUtils {
             e.printStackTrace();

             System.exit(1);

         }

-        

+

         return demo(t, label);

     }

-    

+

     public static JPanel demo(Graph g, final String label) {

     	Color BACKGROUND = Color.WHITE;

         Color FOREGROUND = Color.BLACK;

@@ -56,7 +56,7 @@ public class TreeViewUtils {
         final TreeView tview = new TreeView(g, label, null);

         tview.setBackground(BACKGROUND);

         tview.setForeground(FOREGROUND);

-        

+

         // create a search panel for the tree map

         JSearchPanel search = new JSearchPanel(tview.getVisualization(),

         		TreeViewConstants.treeNodes, Visualization.SEARCH_ITEMS, label, true, true);

@@ -65,7 +65,7 @@ public class TreeViewUtils {
         search.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 11)); //$NON-NLS-1$

         search.setBackground(BACKGROUND);

         search.setForeground(FOREGROUND);

-        

+

         final JFastLabel title = new JFastLabel("                 "); //$NON-NLS-1$

         title.setPreferredSize(new Dimension(350, 20));

         title.setVerticalAlignment(SwingConstants.BOTTOM);

@@ -73,7 +73,7 @@ public class TreeViewUtils {
         title.setFont(FontLib.getFont("Tahoma", Font.PLAIN, 16)); //$NON-NLS-1$

         title.setBackground(BACKGROUND);

         title.setForeground(FOREGROUND);

-        

+

         tview.addControlListener(new ControlAdapter() {

             public void itemEntered(VisualItem item, MouseEvent e) {

                 if ( item.canGetString(label) )

@@ -83,7 +83,7 @@ public class TreeViewUtils {
                 title.setText(null);

             }

         });

-        

+

         Box box = new Box(BoxLayout.X_AXIS);

         box.add(Box.createHorizontalStrut(10));

         box.add(title);

@@ -91,7 +91,7 @@ public class TreeViewUtils {
         box.add(search);

         box.add(Box.createHorizontalStrut(3));

         box.setBackground(BACKGROUND);

-        

+

         JPanel panel = new JPanel(new BorderLayout());

         panel.setBackground(BACKGROUND);

         panel.setForeground(FOREGROUND);

@@ -99,6 +99,6 @@ public class TreeViewUtils {
         panel.add(box, BorderLayout.SOUTH);

         return panel;

     }

-    

-    

+

+

 }

diff --git a/org.eclipse.gmt.modisco.infra.query.core/.checkstyle b/org.eclipse.gmt.modisco.infra.query.core/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.query.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java
index 4cd8562c5..f970529fb 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/AbstractModelQuery.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software)

@@ -33,16 +33,16 @@ import org.eclipse.gmt.modisco.infra.query.runtime.RuntimeFactory;
 /**

  * To get a sub class instance of this class, the {@link ModelQuerySetCatalog}

  * must be used.

- * 

+ *

  * <pre>

  * ModelQuerySetCatalog catalog = ModelQuerySetCatalog.getSingleton();

  * ModelQuerySet modelQuerySet = catalog.getModelQuerySet(&quot;modisco.infra.query.tests.01&quot;);

  * ModelQuery modelQuery = modelQuerySet.getQuery(&quot;test001&quot;);

  * AbstractModelQuery modelQueryInst = catalog.getModelQueryImpl(modelQuery);

  * </pre>

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

- * 

+ *

  * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

 @Deprecated

@@ -53,7 +53,7 @@ public abstract class AbstractModelQuery {
 

 	/**

 	 * AbstractModelQuery constructor

-	 * 

+	 *

 	 * @param modelQuery

 	 *            the model query description (model element)

 	 */

@@ -64,7 +64,7 @@ public abstract class AbstractModelQuery {
 	/**

 	 * This method returns the model query element passed as parameter to the

 	 * constructor

-	 * 

+	 *

 	 * @return The model query element passed as parameter to the constructor

 	 */

 	public final ModelQuery getModelQuery() {

@@ -74,10 +74,10 @@ public abstract class AbstractModelQuery {
 	/**

 	 * This method is used to evaluate the query on a set of models and model

 	 * elements described by the context parameter.

-	 * 

+	 *

 	 * The query is evaluated on each contextually referred model element and on

 	 * each element of a contextually referred model.

-	 * 

+	 *

 	 * @param context

 	 *            The query evaluation context described by a ModelQueryContext

 	 *            instance.

@@ -112,7 +112,7 @@ public abstract class AbstractModelQuery {
 	 * {@link AbstractModelQuery#evaluate(ModelQueryContext, List)} is called).

 	 * <p>

 	 * A subclass will receive in order:<br>

-	 * 

+	 *

 	 * <pre>

 	 * startEvaluate()

 	 * basicEvaluate(context1, parameters)

@@ -121,9 +121,9 @@ public abstract class AbstractModelQuery {
 	 * basicEvaluate(contextn, parameters)

 	 * endEvaluate()

 	 * </pre>

-	 * 

+	 *

 	 * </p>

-	 * 

+	 *

 	 * @see {@link AbstractModelQuery#endEvaluate()}

 	 */

 	protected void startEvaluate() {

@@ -133,7 +133,7 @@ public abstract class AbstractModelQuery {
 	/**

 	 * Called when ending the evaluation of a query on one or several context

 	 * elements.

-	 * 

+	 *

 	 * @see {@link AbstractModelQuery#startEvaluate()}

 	 */

 	protected void endEvaluate() {

@@ -143,7 +143,7 @@ public abstract class AbstractModelQuery {
 	/**

 	 * This method is used to evaluate the query on one model element. The

 	 * method is only usable for queries which do not have any parameters.

-	 * 

+	 *

 	 * @param context

 	 *            The query evaluation context

 	 * @return A ModelQueryResult instance

@@ -162,7 +162,7 @@ public abstract class AbstractModelQuery {
 	/**

 	 * This method is used to evaluate the query on one model element. The

 	 * method is usable for queries which have parameters.

-	 * 

+	 *

 	 * @param context

 	 *            The query evaluation context

 	 * @param parameterValues

@@ -224,7 +224,7 @@ public abstract class AbstractModelQuery {
 	/**

 	 * This method must be overridden by each sub class to implement query

 	 * evaluation.

-	 * 

+	 *

 	 * @param context

 	 *            The query evaluation context

 	 * @param parameterValues

@@ -239,7 +239,7 @@ public abstract class AbstractModelQuery {
 	 * This method is equivalent to {@link AbstractModelQuery#evaluate(EObject)}

 	 * but rather than return the errors into a ModelQueryResult instance, it

 	 * throws an exception.

-	 * 

+	 *

 	 * @param context

 	 *            The query evaluation context

 	 * @return The query result.

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java
index 47d0e552e..d3fa03abd 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryFactory.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java
index 70bc6b5b9..92d20e862 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/IModelQueryTooltip.java
@@ -23,7 +23,7 @@ import org.eclipse.swt.custom.StyledText;
 public interface IModelQueryTooltip {

 	/**

 	 * Set the tooltip text into the {@link StyledText} component.

-	 * 

+	 *

 	 * @param modelQuery

 	 *            the query that is beeing hovered, and for which the tooltip

 	 *            should be displayed

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java
index 7914ba133..582677ce1 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ModelQuerySetCatalog.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -95,7 +95,7 @@ public final class ModelQuerySetCatalog extends AbstractMoDiscoCatalog {
 	/**

 	 * This method returns the model query set of the resource having for name

 	 * the "name" parameter value.

-	 * 

+	 *

 	 * @param name

 	 *            the name of a resource contained in the catalog

 	 * @return return a model query set

@@ -115,7 +115,7 @@ public final class ModelQuerySetCatalog extends AbstractMoDiscoCatalog {
 	/**

 	 * This methods returns the query sets of all the resources contained in the

 	 * catalog.

-	 * 

+	 *

 	 * @return returns all the query sets

 	 */

 	public Collection<ModelQuerySet> getAllModelQuerySets() {

@@ -164,7 +164,7 @@ public final class ModelQuerySetCatalog extends AbstractMoDiscoCatalog {
 

 	/**

 	 * This method returns the list of the installed model query factory.

-	 * 

+	 *

 	 * @return model query factories

 	 */

 	public List<IModelQueryFactory> getInstalledModelQueryFactory() {

@@ -174,7 +174,7 @@ public final class ModelQuerySetCatalog extends AbstractMoDiscoCatalog {
 	/**

 	 * This method return a java object containing the model query

 	 * implementation.

-	 * 

+	 *

 	 * @param modelQuery

 	 *            a model query

 	 * @return a model query implementation instance

@@ -220,7 +220,7 @@ public final class ModelQuerySetCatalog extends AbstractMoDiscoCatalog {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.gmt.modisco.infra.common.core.builder.AbstractMoDiscoCatalog#

 	 * getActivator()

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java
index 612c22517..38a74540c 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryException.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java
index a58df7e89..ead222969 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryExecutionException.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java
index a01bd9ac1..bcf429603 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ModelQueryTypeCheckingException.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java
index 4c0725db3..920bfee11 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/exception/ProjectDisabledException.java
@@ -22,7 +22,7 @@ public class ProjectDisabledException extends ModelQueryException {
 	}

 

 	/**

-	 * 

+	 *

 	 */

 	private static final long serialVersionUID = 5762609362502765757L;

 

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java
index e6bf5cde8..e6d776a7c 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -39,7 +39,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

 	 */

@@ -52,7 +52,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

@@ -65,7 +65,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java
index 94ff8eed2..b9436387c 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryBuilder.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas BROS (Mia-Software)

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java
index fa0b3a626..bf516973e 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/QueryProtocolExtension.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -22,7 +22,7 @@ public class QueryProtocolExtension implements IModiscoProtocolExtension {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.gmt.modisco.infra.common.core.IModiscoResourceFactoryExt#

 	 * getSchemeSpecificPart()

 	 */

@@ -32,7 +32,7 @@ public class QueryProtocolExtension implements IModiscoProtocolExtension {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.gmt.modisco.infra.common.core.internal.IModiscoResourceFactoryExt

 	 * #getURI (java.lang.String)

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java
index ce855b0bf..53d5abb04 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/ReferedFileHandler.java
@@ -30,7 +30,7 @@ import org.osgi.framework.Bundle;
 /**

  * This class represents a reference to a file pointed by a model query

  * attribute.

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

  * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

@@ -45,7 +45,7 @@ public final class ReferedFileHandler {
 	 * This method returns an instance of ReferedFileHandler. The instance of

 	 * ReferedFileHandler can be used to check the existence of a file and get

 	 * its input stream.

-	 * 

+	 *

 	 * @param containerName

 	 *            The name of the containing plug-in or project. If

 	 *            containerName is null, the query model element container

@@ -96,7 +96,7 @@ public final class ReferedFileHandler {
 

 	/**

 	 * This method returns true is the file exists.

-	 * 

+	 *

 	 * @return Returns true is the file exists.

 	 */

 	public boolean exists() {

@@ -117,7 +117,7 @@ public final class ReferedFileHandler {
 

 	/**

 	 * Return a input stream to the corresponding file

-	 * 

+	 *

 	 * @return an input stream

 	 * @throws Exception

 	 *             If the file is not readable

@@ -140,7 +140,7 @@ public final class ReferedFileHandler {
 	/**

 	 * If the referred file is a workspace file, this method return return an

 	 * IFile instance representing the referred file

-	 * 

+	 *

 	 * @return an IFile instance representing the referred file, null if this

 	 *         referred file is not a workspace file.

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java
index e6955da6b..8239e11d0 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/utils/QueryUtils.java
@@ -46,7 +46,7 @@ public final class QueryUtils {
 		}

 		return type;

 	}

-	

+

 	public static String qualifiedObjectType(final String type) {

 		if ("byte".equals(type)) { //$NON-NLS-1$

 			return "java.lang.Byte"; //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java
index 3d5d1f3b0..eb94dea82 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/EValidatorAdapter.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java
index a48e99191..1921faa05 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ImplementationClassInterface.java
@@ -280,7 +280,7 @@ public class ImplementationClassInterface extends AbstractModelConstraint {
 	/**

 	 * Check that each possible context of the query is a sub-type of the

 	 * context type defined in the Java implementation class.

-	 * 

+	 *

 	 * @param contextType

 	 *            the context defined on the implementation class

 	 * @param queryImplType

@@ -343,7 +343,7 @@ public class ImplementationClassInterface extends AbstractModelConstraint {
 	/**

 	 * Returns whether the given type matches the expected type, or one of its

 	 * sub-types.

-	 * 

+	 *

 	 * @param type

 	 *            the type to validate

 	 * @param expectedType

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java
index 2a9158fcc..975570f9c 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ModelQuerySetRoot.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java
index 6cacaa73f..8eab67cdf 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/NonEmptyName.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java
index 53ce0068c..65153124c 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ParameterUniqueName.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java
index eb724aa02..1369fbfd4 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/ScopeValidation.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java
index 6cbb7144b..7f004ed00 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/internal/validation/UniqueName.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java
index 2a15c791c..8e1a49ff9 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/IJavaModelQuery.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

@@ -27,7 +27,7 @@ public interface IJavaModelQuery<T extends EObject, R> {
 	/**

 	 * This method must be overridden by each sub class to implement query

 	 * evaluation.

-	 * 

+	 *

 	 * @param context

 	 *            The query evaluation context

 	 * @param parameterValues

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java
index ca284da89..6cfcb9d13 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/ParameterValueList.java
@@ -19,7 +19,7 @@ import org.eclipse.gmt.modisco.infra.query.runtime.ModelQueryParameterValue;
 import org.eclipse.gmt.modisco.infra.query.runtime.RuntimeFactory;

 

 /**

- * List of query parameters, with two method for name direct value / param access. 

+ * List of query parameters, with two method for name direct value / param access.

  *

  * @deprecated replaced by EMF Facet, cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470578

  */

@@ -48,7 +48,7 @@ public class ParameterValueList extends ArrayList<ModelQueryParameterValue> {
 

 	/**

 	 * Return the parameter with specified name.

-	 * 

+	 *

 	 * @param name

 	 *            the name.

 	 * @return the parameter, or null if parameter is unknown.

@@ -73,7 +73,7 @@ public class ParameterValueList extends ArrayList<ModelQueryParameterValue> {
 

 	/**

 	 * Return the parameter with specified a parameter object.

-	 * 

+	 *

 	 * @param parameter

 	 *            the parameter object.

 	 * @return the parameter, or null if parameter is unknown.

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java
index 7cdd9c303..93853eb41 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryAdapter.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java
index 8aa916fbf..e8abe0bcb 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaModelQueryFactory.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software)

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java
index 4b9fa071a..d22b9f908 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/java/internal/JavaValidationQueryBuilder.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software)

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java
index a2746680e..4ac438713 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OCLModelQueryAdapter.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java
index 9018eb6f4..120a62a8a 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.core/src/org/eclipse/gmt/modisco/infra/query/core/ocl/OclModelQueryFactory.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/.checkstyle b/org.eclipse.gmt.modisco.infra.query.edit/.checkstyle
index 35a1a252e..a7d304c35 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.query.edit/.checkstyle
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-<local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+<local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/edit/provider"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/.classpath b/org.eclipse.gmt.modisco.infra.query.edit/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/.classpath
+++ b/org.eclipse.gmt.modisco.infra.query.edit/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/build.properties b/org.eclipse.gmt.modisco.infra.query.edit/build.properties
index 459117d87..eb870481f 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/build.properties
+++ b/org.eclipse.gmt.modisco.infra.query.edit/build.properties
@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                icons/,\

@@ -15,6 +16,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java
index f9e9f1c13..f9e9f1c13 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/JavaModelQueryItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java
index 827e6c5bc..827e6c5bc 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java
index 2954df52b..2954df52b 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQueryParameterItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java
index e8209b973..e8209b973 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/ModelQuerySetItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java
index 2b24cce14..2b24cce14 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/OCLModelQueryItemProvider.java
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java
index 0ae71abd7..0ae71abd7 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryEditPlugin.java
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java
index beb60c141..beb60c141 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/src/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.edit/src-gen/org/eclipse/gmt/modisco/infra/query/edit/provider/QueryItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/.checkstyle b/org.eclipse.gmt.modisco.infra.query.editor/.checkstyle
index 653a82167..2638c0b1f 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.query.editor/.checkstyle
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/editor/presentation"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/.classpath b/org.eclipse.gmt.modisco.infra.query.editor/.classpath
index 45f024e85..e5fbd3dd2 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/.classpath
+++ b/org.eclipse.gmt.modisco.infra.query.editor/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/build.properties b/org.eclipse.gmt.modisco.infra.query.editor/build.properties
index 459117d87..1ad367c22 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/build.properties
+++ b/org.eclipse.gmt.modisco.infra.query.editor/build.properties
@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                icons/,\

@@ -15,6 +16,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java
index 147103414..147103414 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/LoadMetaModelResourceAction.java
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java
index 79f25603f..79f25603f 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryActionBarContributor.java
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java
index 84c528698..84c528698 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditor.java
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java
index 0bece543a..0bece543a 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryEditorPlugin.java
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java
index bf8a677a1..bf8a677a1 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/src/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java
+++ b/org.eclipse.gmt.modisco.infra.query.editor/src-gen/org/eclipse/gmt/modisco/infra/query/editor/presentation/QueryModelWizard.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/.checkstyle b/org.eclipse.gmt.modisco.infra.query.jxpath/.checkstyle
index 9ab7a0abc..699104fb8 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/.checkstyle
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/jxpath"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/jxpath/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/jxpath/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/.classpath b/org.eclipse.gmt.modisco.infra.query.jxpath/.classpath
index 2d1a4302f..2734480ce 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/.classpath
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/.classpath
@@ -2,6 +2,7 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/build.properties b/org.eclipse.gmt.modisco.infra.query.jxpath/build.properties
index 0d096a139..8bdd41db6 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/build.properties
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -15,6 +16,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/,\

+           src/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/model/jxpath.genmodel b/org.eclipse.gmt.modisco.infra.query.jxpath/model/jxpath.genmodel
index 75649e726..cddd8b697 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/model/jxpath.genmodel
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/model/jxpath.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!--

-Copyright (c) 2009 Mia-Software.

+Copyright (c) 2009, 2018 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

@@ -9,10 +9,11 @@ http://www.eclipse.org/legal/epl-v10.html
 Contributors:

 	Frederic Madiot (Mia-Software) - Meta-model design

     Gregoire DUPE (Mia-Software) - Meta-model design and implementation

+	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 -->

 <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="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;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

     modelDirectory="/org.eclipse.gmt.modisco.infra.query.jxpath/src" modelPluginID="org.eclipse.gmt.modisco.infra.query.jxpath"

     modelName="Jxpath" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"

     copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.gmt.modisco.infra.query/model/query.genmodel#//query">

diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java
index 207dcf978..207dcf978 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/JXPathModelQuery.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java
index a10329c23..a10329c23 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java
index 0a74f83a3..0a74f83a3 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/JxpathPackage.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java
index c7a886533..c7a886533 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JXPathModelQueryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java
index 12cdaf9f7..12cdaf9f7 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java
index d0cfd6fa3..d0cfd6fa3 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/impl/JxpathPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java
index bcd528656..bcd528656 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java
index eac048016..eac048016 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/src/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/src-gen/org/eclipse/gmt/modisco/infra/query/jxpath/util/JxpathSwitch.java
diff --git a/org.eclipse.gmt.modisco.infra.query.ui/.checkstyle b/org.eclipse.gmt.modisco.infra.query.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.query.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java
index 89aedf38d..f184686ad 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/Activator.java
@@ -30,7 +30,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -43,7 +43,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -56,7 +56,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java
index f7d655a58..6fc7b0dac 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/ImageProvider.java
@@ -40,7 +40,7 @@ public final class ImageProvider {
 

 	/**

 	 * Create an image descriptor from a resource

-	 * 

+	 *

 	 * @param resourcePath

 	 *            the path of the resource (in the bundle)

 	 * @return the image descriptor

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java
index bad7437d6..5657daae3 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/controls/QueryFilteredTree.java
@@ -43,7 +43,7 @@ public class QueryFilteredTree extends FilteredTree {
 

 	/**

 	 * Create a tree with a filter text field to select queries.

-	 * 

+	 *

 	 * @param parentComposite

 	 *            the parent composite

 	 * @param availableQuerySets

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java
index 8025700bd..1523e5861 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/extensions/IQueryAttributesWizardPage.java
@@ -22,7 +22,7 @@ public interface IQueryAttributesWizardPage extends IWizardPage {
 

 	/**

 	 * Initialize the wizard page

-	 * 

+	 *

 	 * @param modelQuerySet

 	 *            an existing query set, in which the query will be added

 	 * @param modelQuery

@@ -34,7 +34,7 @@ public interface IQueryAttributesWizardPage extends IWizardPage {
 	/**

 	 * Called when the wizard is finished to apply the attributes defined in the

 	 * wizard page to the model query.

-	 * 

+	 *

 	 * @param modelQuery

 	 *            the query to which to apply the wizard page's attributes

 	 */

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java
index 2ce21829d..3bd35ed49 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/views/queryExecution/internal/QueryResultDisplayersRegistry.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

- *    

+ *

  *******************************************************************************/

 

 package org.eclipse.gmt.modisco.infra.query.ui.views.queryExecution.internal;

diff --git a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java
index eec3a2924..a20997688 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java
+++ b/org.eclipse.gmt.modisco.infra.query.ui/src/org/eclipse/gmt/modisco/infra/query/ui/wizards/NewClassWizardPage.java
@@ -1,11 +1,11 @@
 /**

  * Copyright (c) 2011 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:

  * 	Nicolas Guyomar (Mia-Software) - Bug 344243 - illegal API use in org.eclipse.gmt.modisco.infra.query.ui.wizards.NewQueryClassWizardPage

  */

diff --git a/org.eclipse.gmt.modisco.infra.query/.checkstyle b/org.eclipse.gmt.modisco.infra.query/.checkstyle
index 4f52282a8..699104fb8 100644
--- a/org.eclipse.gmt.modisco.infra.query/.checkstyle
+++ b/org.eclipse.gmt.modisco.infra.query/.checkstyle
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/runtime"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/runtime/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/runtime/util"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/infra/query/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.infra.query/.classpath b/org.eclipse.gmt.modisco.infra.query/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.infra.query/.classpath
+++ b/org.eclipse.gmt.modisco.infra.query/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.infra.query/.settings/org.eclipse.core.resources.prefs b/org.eclipse.gmt.modisco.infra.query/.settings/org.eclipse.core.resources.prefs
index ac3f432e1..f6a28a3b5 100644
--- a/org.eclipse.gmt.modisco.infra.query/.settings/org.eclipse.core.resources.prefs
+++ b/org.eclipse.gmt.modisco.infra.query/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
-#Mon Oct 04 10:37:39 CEST 2010

 eclipse.preferences.version=1

 encoding//model/query.ecore=UTF-8

 encoding//model/query.ecorediag=UTF-8

-encoding//src/org/eclipse/gmt/modisco/infra/query/messages.properties=ISO-8859-1

+encoding//src-gen/org/eclipse/gmt/modisco/infra/query/messages.properties=ISO-8859-1

 encoding/<project>=UTF-8

diff --git a/org.eclipse.gmt.modisco.infra.query/build.properties b/org.eclipse.gmt.modisco.infra.query/build.properties
index 3cc93b7a9..8a965cca7 100644
--- a/org.eclipse.gmt.modisco.infra.query/build.properties
+++ b/org.eclipse.gmt.modisco.infra.query/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -15,7 +16,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html,\

                model/

diff --git a/org.eclipse.gmt.modisco.infra.query/model/query.genmodel b/org.eclipse.gmt.modisco.infra.query/model/query.genmodel
index c03014875..0f9bc570f 100644
--- a/org.eclipse.gmt.modisco.infra.query/model/query.genmodel
+++ b/org.eclipse.gmt.modisco.infra.query/model/query.genmodel
@@ -1,8 +1,10 @@
 <?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="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;    Frederic Madiot (Mia-Software) - meta-model design&#xD;&#xA;    Gregoire DUPE (Mia-Software) - design and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.gmt.modisco.infra.query/src" modelPluginID="org.eclipse.gmt.modisco.infra.query"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;    Frederic Madiot (Mia-Software) - meta-model design&#xD;&#xA;    Gregoire DUPE (Mia-Software) - design and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.gmt.modisco.infra.query/src-gen" editDirectory="/org.eclipse.gmt.modisco.infra.query.edit/src-gen"

+    editorDirectory="/org.eclipse.gmt.modisco.infra.query.editor/src-gen"  modelPluginID="org.eclipse.gmt.modisco.infra.query"

+    testsDirectory="/org.eclipse.modisco.infra.query.tests/src-gen" testsPluginID="org.eclipse.modisco.infra.query.tests" 

     modelName="Query" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"

     copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore">

   <foreignModel>query.ecore</foreignModel>

diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java
index bf697d0c3..bf697d0c3 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/JavaModelQuery.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/Messages.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/Messages.java
index ae29d220c..ae29d220c 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/Messages.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/Messages.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuery.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/ModelQuery.java
index 993c364c1..993c364c1 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/ModelQuery.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java
index 6fce273af..6fce273af 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/ModelQueryParameter.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java
index 0df521cb9..0df521cb9 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/ModelQuerySet.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java
index b69d76a69..b69d76a69 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/OCLModelQuery.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryFactory.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/QueryFactory.java
index 45454e57d..45454e57d 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/QueryFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryPackage.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/QueryPackage.java
index 30156d88f..30156d88f 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/QueryPackage.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/QueryPackage.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java
index 57a5d56ea..57a5d56ea 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/JavaModelQueryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java
index 04fff7104..04fff7104 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java
index 177877988..177877988 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/ModelQueryParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java
index 5fe47ff77..5fe47ff77 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/ModelQuerySetImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java
index 75d27fef0..75d27fef0 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/OCLModelQueryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java
index 561953652..561953652 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/QueryFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java
index b0589a29c..b0589a29c 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/impl/QueryPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/messages.properties b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/messages.properties
index 640f937db..640f937db 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/messages.properties
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/messages.properties
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java
index b880c0605..b880c0605 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/plugin/QueryPlugin.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java
index 7a6b5bb4a..7a6b5bb4a 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryContext.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java
index 36960766e..36960766e 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryParameterValue.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java
index 2173bfc26..2173bfc26 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/ModelQueryResult.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java
index a3a81d96d..a3a81d96d 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/RuntimeFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java
index ff97949d6..ff97949d6 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/RuntimePackage.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java
index 0aec13d32..0aec13d32 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryContextImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java
index 903211192..903211192 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryParameterValueImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java
index 49c27e51d..49c27e51d 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/ModelQueryResultImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java
index f6005db77..f6005db77 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimeFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java
index af4fbf94f..af4fbf94f 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/impl/RuntimePackageImpl.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java
index 1afed651c..1afed651c 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java
index f95606ff4..f95606ff4 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/runtime/util/RuntimeSwitch.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/util/QueryAdapterFactory.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/util/QueryAdapterFactory.java
index 0525f0f9e..0525f0f9e 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/util/QueryAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/util/QueryAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/util/QuerySwitch.java b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/util/QuerySwitch.java
index f91be7c79..f91be7c79 100644
--- a/org.eclipse.gmt.modisco.infra.query/src/org/eclipse/gmt/modisco/infra/query/util/QuerySwitch.java
+++ b/org.eclipse.gmt.modisco.infra.query/src-gen/org/eclipse/gmt/modisco/infra/query/util/QuerySwitch.java
diff --git a/org.eclipse.gmt.modisco.java.browser.customization/.checkstyle b/org.eclipse.gmt.modisco.java.browser.customization/.checkstyle
index b078a54d3..f896b8087 100644
--- a/org.eclipse.gmt.modisco.java.browser.customization/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.browser.customization/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="Modisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="Modisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="Modisco" local="true">
diff --git a/org.eclipse.gmt.modisco.java.cdo/.checkstyle b/org.eclipse.gmt.modisco.java.cdo/.checkstyle
index 56d54054e..699104fb8 100644
--- a/org.eclipse.gmt.modisco.java.cdo/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.cdo/.checkstyle
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/java/cdo/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/cdo/meta"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/cdo/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.java.cdo/.classpath b/org.eclipse.gmt.modisco.java.cdo/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.java.cdo/.classpath
+++ b/org.eclipse.gmt.modisco.java.cdo/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.java.cdo/build.properties b/org.eclipse.gmt.modisco.java.cdo/build.properties
index f73f0a67c..4b3832850 100644
--- a/org.eclipse.gmt.modisco.java.cdo/build.properties
+++ b/org.eclipse.gmt.modisco.java.cdo/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Fabien GIQUEL (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -19,6 +20,6 @@ bin.includes = .,\
                about.properties,\

                modeling32.png

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.java.cdo/model/java.genmodel b/org.eclipse.gmt.modisco.java.cdo/model/java.genmodel
index 08ba45872..80da71947 100644
--- a/org.eclipse.gmt.modisco.java.cdo/model/java.genmodel
+++ b/org.eclipse.gmt.modisco.java.cdo/model/java.genmodel
@@ -1,8 +1,8 @@
 <?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;&#xD;&#xA;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.gmt.modisco.java.cdo/src" modelPluginID="org.eclipse.gmt.modisco.java.cdo"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009, 2018 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.java.cdo/src-gen" modelPluginID="org.eclipse.gmt.modisco.java.cdo"

     forceOverwrite="true" modelName="Java" rootExtendsInterface="org.eclipse.emf.cdo.CDOObject"

     rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl" reflectiveDelegation="true"

     importerID="org.eclipse.emf.importer.cdo" bundleManifest="false" featureDelegation="Reflective"

diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ASTNodeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ASTNodeImpl.java
index c5fa9b426..c5fa9b426 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ASTNodeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ASTNodeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodDeclarationImpl.java
index bc21e2a24..bc21e2a24 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodInvocationImpl.java
index 0bafd05e1..0bafd05e1 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeDeclarationImpl.java
index 563e01aba..563e01aba 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeQualifiedExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeQualifiedExpressionImpl.java
index 21cf9ae0b..21cf9ae0b 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeQualifiedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractTypeQualifiedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractVariablesContainerImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractVariablesContainerImpl.java
index a99b5b3fb..a99b5b3fb 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AbstractVariablesContainerImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AbstractVariablesContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationImpl.java
index 79e5bbfd9..79e5bbfd9 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationMemberValuePairImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationMemberValuePairImpl.java
index 1e80745d7..1e80745d7 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationMemberValuePairImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationMemberValuePairImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeDeclarationImpl.java
index d0176c3ca..d0176c3ca 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeMemberDeclarationImpl.java
index 96e9f4a9e..96e9f4a9e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnonymousClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnonymousClassDeclarationImpl.java
index c23db8196..c23db8196 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AnonymousClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AnonymousClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArchiveImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArchiveImpl.java
index 7a5d10c7f..7a5d10c7f 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArchiveImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArchiveImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayAccessImpl.java
index 31d41422a..31d41422a 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayCreationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayCreationImpl.java
index 2297205c2..2297205c2 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayInitializerImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayInitializerImpl.java
index 947cccda3..947cccda3 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayInitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayInitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayLengthAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayLengthAccessImpl.java
index 2ad0dedc3..2ad0dedc3 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayLengthAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayLengthAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayTypeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayTypeImpl.java
index d6b51da6e..d6b51da6e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ArrayTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AssertStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AssertStatementImpl.java
index 4c8ca6684..4c8ca6684 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AssertStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AssertStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AssignmentImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AssignmentImpl.java
index 0ff018f2a..0ff018f2a 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/AssignmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/AssignmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BlockCommentImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BlockCommentImpl.java
index 8147f0371..8147f0371 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BlockCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BlockCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BlockImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BlockImpl.java
index 7fbae8f09..7fbae8f09 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BlockImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BlockImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BodyDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BodyDeclarationImpl.java
index 54244ecee..54244ecee 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BodyDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BodyDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BooleanLiteralImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BooleanLiteralImpl.java
index 3f849a2d2..3f849a2d2 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BooleanLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BooleanLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BreakStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BreakStatementImpl.java
index 217462bc1..217462bc1 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/BreakStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/BreakStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CastExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CastExpressionImpl.java
index bee10ad84..bee10ad84 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CastExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CastExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CatchClauseImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CatchClauseImpl.java
index 60a05afc4..60a05afc4 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CatchClauseImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CatchClauseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CharacterLiteralImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CharacterLiteralImpl.java
index 900f03eeb..900f03eeb 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CharacterLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CharacterLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ClassDeclarationImpl.java
index a327226a6..a327226a6 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ClassFileImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ClassFileImpl.java
index d3de73468..d3de73468 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ClassFileImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ClassFileImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ClassInstanceCreationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ClassInstanceCreationImpl.java
index 98d687071..98d687071 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ClassInstanceCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ClassInstanceCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CommentImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CommentImpl.java
index 09de05bde..09de05bde 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CompilationUnitImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CompilationUnitImpl.java
index dc05dee64..dc05dee64 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/CompilationUnitImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ConditionalExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ConditionalExpressionImpl.java
index e8baab31a..e8baab31a 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ConditionalExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorDeclarationImpl.java
index 1647c30ca..1647c30ca 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorInvocationImpl.java
index 8f23594cf..8f23594cf 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ContinueStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ContinueStatementImpl.java
index 783cd645e..783cd645e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ContinueStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ContinueStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/DoStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/DoStatementImpl.java
index 3e851b0b5..3e851b0b5 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/DoStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/DoStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EmptyStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EmptyStatementImpl.java
index a42c7f69c..a42c7f69c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EmptyStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EmptyStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EnhancedForStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EnhancedForStatementImpl.java
index d9daa1ef7..d9daa1ef7 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EnhancedForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EnhancedForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EnumConstantDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EnumConstantDeclarationImpl.java
index dbbfb4228..dbbfb4228 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EnumConstantDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EnumConstantDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EnumDeclarationImpl.java
index 932f8be28..932f8be28 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/EnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/EnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionImpl.java
index 45390e933..45390e933 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionStatementImpl.java
index 2fd2f1da8..2fd2f1da8 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ExpressionStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/FieldAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/FieldAccessImpl.java
index b1e71c6b7..b1e71c6b7 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/FieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/FieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/FieldDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/FieldDeclarationImpl.java
index 95e5da293..95e5da293 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/FieldDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/FieldDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ForStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ForStatementImpl.java
index d8b8639f8..d8b8639f8 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/IfStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/IfStatementImpl.java
index f7b79cf37..f7b79cf37 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/IfStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/IfStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ImportDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ImportDeclarationImpl.java
index a0d209a3c..a0d209a3c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ImportDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ImportDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InfixExpressionImpl.java
index c8b3c93b1..c8b3c93b1 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InitializerImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InitializerImpl.java
index b956a33e5..b956a33e5 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InstanceofExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InstanceofExpressionImpl.java
index e8f98dae6..e8f98dae6 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InstanceofExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InstanceofExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InterfaceDeclarationImpl.java
index 9a8f373a0..9a8f373a0 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/InterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/InterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/JavaFactoryImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/JavaFactoryImpl.java
index 4ac97e5c6..4ac97e5c6 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/JavaFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/JavaFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/JavaPackageImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/JavaPackageImpl.java
index 9c883178e..9c883178e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/JavaPackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/JavaPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/JavadocImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/JavadocImpl.java
index ea6942adf..ea6942adf 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/JavadocImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/JavadocImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/LabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/LabeledStatementImpl.java
index 5451f2c31..5451f2c31 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/LabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/LabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/LineCommentImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/LineCommentImpl.java
index 2a0be7456..2a0be7456 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/LineCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/LineCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ManifestAttributeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ManifestAttributeImpl.java
index 8fcf7d495..8fcf7d495 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ManifestAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ManifestAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ManifestEntryImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ManifestEntryImpl.java
index 8a21fd266..8a21fd266 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ManifestEntryImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ManifestEntryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ManifestImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ManifestImpl.java
index 7de64b8aa..7de64b8aa 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ManifestImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ManifestImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MemberRefImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MemberRefImpl.java
index bfd40956b..bfd40956b 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MemberRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MemberRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodDeclarationImpl.java
index 4f112ba79..4f112ba79 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodInvocationImpl.java
index 09e3f7770..09e3f7770 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefImpl.java
index 3b7fefbfc..3b7fefbfc 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefParameterImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefParameterImpl.java
index 4dcf1b89c..4dcf1b89c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/MethodRefParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ModelImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ModelImpl.java
index 68bb58117..68bb58117 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ModelImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ModelImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ModifierImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ModifierImpl.java
index 26c12fb19..26c12fb19 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ModifierImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ModifierImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NamedElementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NamedElementImpl.java
index 4a3c93131..4a3c93131 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NamedElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NamedElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NamespaceAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NamespaceAccessImpl.java
index e091cce01..e091cce01 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NamespaceAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NamespaceAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NullLiteralImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NullLiteralImpl.java
index d637de1f2..d637de1f2 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NullLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NullLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NumberLiteralImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NumberLiteralImpl.java
index 1a78eb07e..1a78eb07e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/NumberLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/NumberLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PackageAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PackageAccessImpl.java
index 540fc132e..540fc132e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PackageAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PackageAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PackageImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PackageImpl.java
index b58881090..b58881090 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ParameterizedTypeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ParameterizedTypeImpl.java
index b713b9ecc..b713b9ecc 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ParameterizedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ParameterizedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ParenthesizedExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ParenthesizedExpressionImpl.java
index d2c7905cc..d2c7905cc 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ParenthesizedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ParenthesizedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PostfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PostfixExpressionImpl.java
index 2c2788679..2c2788679 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PostfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PostfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrefixExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrefixExpressionImpl.java
index 2efed6054..2efed6054 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrefixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrefixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeBooleanImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeBooleanImpl.java
index 812b3a729..812b3a729 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeBooleanImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeBooleanImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeByteImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeByteImpl.java
index 8e74e97f2..8e74e97f2 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeByteImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeByteImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeCharImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeCharImpl.java
index ae8633e3c..ae8633e3c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeCharImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeCharImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeDoubleImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeDoubleImpl.java
index 0a1718385..0a1718385 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeDoubleImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeDoubleImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeFloatImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeFloatImpl.java
index 66aa85099..66aa85099 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeFloatImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeFloatImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeImpl.java
index c1e12e48d..c1e12e48d 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeIntImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeIntImpl.java
index 875344611..875344611 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeIntImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeIntImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeLongImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeLongImpl.java
index fcb3f0451..fcb3f0451 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeLongImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeLongImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeShortImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeShortImpl.java
index f7a92aca2..f7a92aca2 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeShortImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeShortImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeVoidImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeVoidImpl.java
index 094e34125..094e34125 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeVoidImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/PrimitiveTypeVoidImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ReturnStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ReturnStatementImpl.java
index 7c980b297..7c980b297 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ReturnStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ReturnStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableAccessImpl.java
index 9b284758f..9b284758f 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableDeclarationImpl.java
index af9221c51..af9221c51 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/StatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/StatementImpl.java
index 4dd13fcec..4dd13fcec 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/StatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/StatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/StringLiteralImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/StringLiteralImpl.java
index bc90d75ce..bc90d75ce 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/StringLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/StringLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SuperConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SuperConstructorInvocationImpl.java
index 9ee863ba4..9ee863ba4 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SuperConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SuperConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SuperFieldAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SuperFieldAccessImpl.java
index b120ebc39..b120ebc39 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SuperFieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SuperFieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SuperMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SuperMethodInvocationImpl.java
index 86f24ea7b..86f24ea7b 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SuperMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SuperMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SwitchCaseImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SwitchCaseImpl.java
index 958339be4..958339be4 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SwitchCaseImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SwitchCaseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SwitchStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SwitchStatementImpl.java
index 08d23785b..08d23785b 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SwitchStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SwitchStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SynchronizedStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SynchronizedStatementImpl.java
index df4cf2cb3..df4cf2cb3 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/SynchronizedStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/SynchronizedStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TagElementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TagElementImpl.java
index 63b798ff3..63b798ff3 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TagElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TagElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TextElementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TextElementImpl.java
index 22d877145..22d877145 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TextElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TextElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ThisExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ThisExpressionImpl.java
index b09f6b328..b09f6b328 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ThisExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ThisExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ThrowStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ThrowStatementImpl.java
index 126f9829a..126f9829a 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/ThrowStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/ThrowStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TryStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TryStatementImpl.java
index a9f5bd00b..a9f5bd00b 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TryStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TryStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeAccessImpl.java
index 6d7cdf759..6d7cdf759 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationImpl.java
index 43856a952..43856a952 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationStatementImpl.java
index 51fdd0333..51fdd0333 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeImpl.java
index 92e517df5..92e517df5 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeLiteralImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeLiteralImpl.java
index 5f6a9b10c..5f6a9b10c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeParameterImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeParameterImpl.java
index 239418ad1..239418ad1 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/TypeParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/TypeParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationDeclarationImpl.java
index e4517abe9..e4517abe9 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
index 0781be0aa..0781be0aa 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedClassDeclarationImpl.java
index 949bb710b..949bb710b 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedEnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedEnumDeclarationImpl.java
index d013cd168..d013cd168 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedEnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedEnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedInterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedInterfaceDeclarationImpl.java
index 25c7dab52..25c7dab52 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedInterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedInterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemAccessImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemAccessImpl.java
index adf24ca87..adf24ca87 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemImpl.java
index ef9c6fa45..ef9c6fa45 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedItemImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedLabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedLabeledStatementImpl.java
index 851607404..851607404 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedLabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedLabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedMethodDeclarationImpl.java
index f8004e56d..f8004e56d 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java
index ced7cbcdc..ced7cbcdc 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeDeclarationImpl.java
index 88ecf60b7..88ecf60b7 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeImpl.java
index ae3f09770..ae3f09770 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java
index 121338e56..121338e56 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationExpressionImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationExpressionImpl.java
index faa51cee9..faa51cee9 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationFragmentImpl.java
index eab002346..eab002346 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationImpl.java
index a2143b7ef..a2143b7ef 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationStatementImpl.java
index c1e9e504e..c1e9e504e 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/VariableDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/WhileStatementImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/WhileStatementImpl.java
index b76328ab1..b76328ab1 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/WhileStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/WhileStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/WildCardTypeImpl.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/WildCardTypeImpl.java
index 58109bf5c..58109bf5c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/WildCardTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/WildCardTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/java.ecore b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/java.ecore
index 2e954b675..2e954b675 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/impl/java.ecore
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/impl/java.ecore
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/meta/JavaFactory.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/meta/JavaFactory.java
index 571753203..571753203 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/meta/JavaFactory.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/meta/JavaFactory.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/meta/JavaPackage.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/meta/JavaPackage.java
index 2ae756b6c..2ae756b6c 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/meta/JavaPackage.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/meta/JavaPackage.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/util/JavaAdapterFactory.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/util/JavaAdapterFactory.java
index 132f223c5..132f223c5 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/util/JavaAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/util/JavaAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/util/JavaSwitch.java b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/util/JavaSwitch.java
index ec2c8a5c3..ec2c8a5c3 100644
--- a/org.eclipse.gmt.modisco.java.cdo/src/org/eclipse/gmt/modisco/java/cdo/util/JavaSwitch.java
+++ b/org.eclipse.gmt.modisco.java.cdo/src-gen/org/eclipse/gmt/modisco/java/cdo/util/JavaSwitch.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/.checkstyle b/org.eclipse.gmt.modisco.java.classiceobject/.checkstyle
index 10758f996..699104fb8 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.classiceobject/.checkstyle
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/java/emf/classic"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/emf/classic/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/emf/classic/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/.classpath b/org.eclipse.gmt.modisco.java.classiceobject/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/.classpath
+++ b/org.eclipse.gmt.modisco.java.classiceobject/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.java.classiceobject/build.properties b/org.eclipse.gmt.modisco.java.classiceobject/build.properties
index b1ba7f2be..2b6ff2977 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/build.properties
+++ b/org.eclipse.gmt.modisco.java.classiceobject/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Fabien GIQUEL (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -15,6 +16,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.java.classiceobject/model/java.genmodel b/org.eclipse.gmt.modisco.java.classiceobject/model/java.genmodel
index 5e3a546c7..93bd5c47e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/model/java.genmodel
+++ b/org.eclipse.gmt.modisco.java.classiceobject/model/java.genmodel
@@ -1,8 +1,8 @@
 <?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;&#xD;&#xA;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.gmt.modisco.java.classiceobject/src" editDirectory="/org.eclipse.gmt.modisco.java.classiceobject.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009, 2018 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.java.classiceobject/src-gen" editDirectory="/org.eclipse.gmt.modisco.java.classiceobject.edit/src"

     editorDirectory="/org.eclipse.gmt.modisco.java.classiceobject.editor/src" modelPluginID="org.eclipse.gmt.modisco.java.classiceobject"

     modelName="Java-classicImpl" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" editPluginID="org.eclipse.gmt.modisco.java.classiceobject.edit"

diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/JavaFactory.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/JavaFactory.java
index ed317ce44..ed317ce44 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/JavaFactory.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/JavaFactory.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/JavaPackage.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/JavaPackage.java
index d22467660..d22467660 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/JavaPackage.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/JavaPackage.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ASTNodeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ASTNodeImpl.java
index c79725214..c79725214 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ASTNodeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ASTNodeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodDeclarationImpl.java
index f79dc4e11..f79dc4e11 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodInvocationImpl.java
index 1e1684afd..1e1684afd 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeDeclarationImpl.java
index 01fd7d49b..01fd7d49b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeQualifiedExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeQualifiedExpressionImpl.java
index 1cb3f923e..1cb3f923e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeQualifiedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractTypeQualifiedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractVariablesContainerImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractVariablesContainerImpl.java
index a0a77ae6b..a0a77ae6b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractVariablesContainerImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AbstractVariablesContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationImpl.java
index 2bb3fa58f..2bb3fa58f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationMemberValuePairImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationMemberValuePairImpl.java
index a67e1345f..a67e1345f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationMemberValuePairImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationMemberValuePairImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeDeclarationImpl.java
index 2a14e6c19..2a14e6c19 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeMemberDeclarationImpl.java
index 5ddabff5f..5ddabff5f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnonymousClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnonymousClassDeclarationImpl.java
index 694432a7b..694432a7b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AnonymousClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AnonymousClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArchiveImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArchiveImpl.java
index 0f4aa4b2f..0f4aa4b2f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArchiveImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArchiveImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayAccessImpl.java
index f0c09fbb4..f0c09fbb4 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayCreationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayCreationImpl.java
index 22e2920c0..22e2920c0 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayInitializerImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayInitializerImpl.java
index 8dbf39848..8dbf39848 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayInitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayInitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayLengthAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayLengthAccessImpl.java
index e91028aef..e91028aef 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayLengthAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayLengthAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayTypeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayTypeImpl.java
index 13e45c6f9..13e45c6f9 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AssertStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AssertStatementImpl.java
index 479fdb730..479fdb730 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AssertStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AssertStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AssignmentImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AssignmentImpl.java
index cb5c8e947..cb5c8e947 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/AssignmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/AssignmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockCommentImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockCommentImpl.java
index 6c2ad676a..6c2ad676a 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockImpl.java
index cef9c4948..cef9c4948 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BlockImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BodyDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BodyDeclarationImpl.java
index 018709492..018709492 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BodyDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BodyDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BooleanLiteralImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BooleanLiteralImpl.java
index 6cac60a3d..6cac60a3d 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BooleanLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BooleanLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BreakStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BreakStatementImpl.java
index 6075bd9c9..6075bd9c9 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/BreakStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/BreakStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CastExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CastExpressionImpl.java
index 8e1062b3a..8e1062b3a 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CastExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CastExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CatchClauseImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CatchClauseImpl.java
index 69617bdb1..69617bdb1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CatchClauseImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CatchClauseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CharacterLiteralImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CharacterLiteralImpl.java
index c41d0a220..c41d0a220 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CharacterLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CharacterLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassDeclarationImpl.java
index 4184857c1..4184857c1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassFileImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassFileImpl.java
index 4fb3a01e1..4fb3a01e1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassFileImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassFileImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassInstanceCreationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassInstanceCreationImpl.java
index ad69caa24..ad69caa24 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassInstanceCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ClassInstanceCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CommentImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CommentImpl.java
index 09e066717..09e066717 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CompilationUnitImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CompilationUnitImpl.java
index 9a86bcc4e..9a86bcc4e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/CompilationUnitImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ConditionalExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ConditionalExpressionImpl.java
index 4dbf4d42b..4dbf4d42b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ConditionalExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorDeclarationImpl.java
index 0d314cda1..0d314cda1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorInvocationImpl.java
index e2a2bd90a..e2a2bd90a 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ContinueStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ContinueStatementImpl.java
index b654745e0..b654745e0 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ContinueStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ContinueStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/DoStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/DoStatementImpl.java
index e80f23766..e80f23766 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/DoStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/DoStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EmptyStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EmptyStatementImpl.java
index 8bb5a5c73..8bb5a5c73 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EmptyStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EmptyStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EnhancedForStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EnhancedForStatementImpl.java
index db59c2f0e..db59c2f0e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EnhancedForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EnhancedForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumConstantDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumConstantDeclarationImpl.java
index 71751df34..71751df34 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumConstantDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumConstantDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumDeclarationImpl.java
index e8a4bf166..e8a4bf166 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/EnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionImpl.java
index 2616c19c3..2616c19c3 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionStatementImpl.java
index 558baadfe..558baadfe 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ExpressionStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldAccessImpl.java
index 425a43789..425a43789 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldDeclarationImpl.java
index 52b651112..52b651112 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/FieldDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ForStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ForStatementImpl.java
index f470e55c3..f470e55c3 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/IfStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/IfStatementImpl.java
index 3afa457e1..3afa457e1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/IfStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/IfStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ImportDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ImportDeclarationImpl.java
index 16bef94c6..16bef94c6 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ImportDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ImportDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InfixExpressionImpl.java
index 0bdf18a2b..0bdf18a2b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InitializerImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InitializerImpl.java
index 49eb42496..49eb42496 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InstanceofExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InstanceofExpressionImpl.java
index 70767762e..70767762e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InstanceofExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InstanceofExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InterfaceDeclarationImpl.java
index e171de420..e171de420 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/InterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/InterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaFactoryImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaFactoryImpl.java
index 1980a27a1..1980a27a1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaPackageImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaPackageImpl.java
index f5fa04ff2..f5fa04ff2 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaPackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/JavaPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/JavadocImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/JavadocImpl.java
index 134668b25..134668b25 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/JavadocImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/JavadocImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/LabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/LabeledStatementImpl.java
index 9bd74f5ce..9bd74f5ce 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/LabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/LabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/LineCommentImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/LineCommentImpl.java
index 363f53995..363f53995 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/LineCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/LineCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestAttributeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestAttributeImpl.java
index b3ab63572..b3ab63572 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestEntryImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestEntryImpl.java
index 667e51ff9..667e51ff9 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestEntryImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestEntryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestImpl.java
index 97352bbf2..97352bbf2 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ManifestImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MemberRefImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MemberRefImpl.java
index 23a508d9a..23a508d9a 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MemberRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MemberRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodDeclarationImpl.java
index b703f53f4..b703f53f4 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodInvocationImpl.java
index 0ce70f238..0ce70f238 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefImpl.java
index a78a8d828..a78a8d828 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefParameterImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefParameterImpl.java
index d7cf4802b..d7cf4802b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/MethodRefParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ModelImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ModelImpl.java
index 04d232f66..04d232f66 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ModelImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ModelImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ModifierImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ModifierImpl.java
index 46ea014f1..46ea014f1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ModifierImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ModifierImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NamedElementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NamedElementImpl.java
index 60cd4dcfd..60cd4dcfd 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NamedElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NamedElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NamespaceAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NamespaceAccessImpl.java
index 905c97611..905c97611 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NamespaceAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NamespaceAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NullLiteralImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NullLiteralImpl.java
index 6f27e8ff8..6f27e8ff8 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NullLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NullLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NumberLiteralImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NumberLiteralImpl.java
index a7788eab7..a7788eab7 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/NumberLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/NumberLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageAccessImpl.java
index f6760486f..f6760486f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageImpl.java
index 5e36d3acc..5e36d3acc 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ParameterizedTypeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ParameterizedTypeImpl.java
index f7f9421fb..f7f9421fb 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ParameterizedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ParameterizedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ParenthesizedExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ParenthesizedExpressionImpl.java
index bb76f73a8..bb76f73a8 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ParenthesizedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ParenthesizedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PostfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PostfixExpressionImpl.java
index 4074a2f80..4074a2f80 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PostfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PostfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrefixExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrefixExpressionImpl.java
index 533caad33..533caad33 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrefixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrefixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeBooleanImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeBooleanImpl.java
index d5acf765d..d5acf765d 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeBooleanImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeBooleanImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeByteImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeByteImpl.java
index 28b5cd5b1..28b5cd5b1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeByteImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeByteImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeCharImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeCharImpl.java
index 11cb0a030..11cb0a030 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeCharImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeCharImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeDoubleImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeDoubleImpl.java
index a56a7aa93..a56a7aa93 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeDoubleImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeDoubleImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeFloatImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeFloatImpl.java
index 1af1d9b11..1af1d9b11 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeFloatImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeFloatImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeImpl.java
index 84998141e..84998141e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeIntImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeIntImpl.java
index 53c4fbbd9..53c4fbbd9 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeIntImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeIntImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeLongImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeLongImpl.java
index 86b70cbf0..86b70cbf0 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeLongImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeLongImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeShortImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeShortImpl.java
index 3c6961611..3c6961611 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeShortImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeShortImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeVoidImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeVoidImpl.java
index ecca26cb0..ecca26cb0 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeVoidImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/PrimitiveTypeVoidImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ReturnStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ReturnStatementImpl.java
index 7f603c310..7f603c310 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ReturnStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ReturnStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableAccessImpl.java
index e605b73af..e605b73af 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableDeclarationImpl.java
index 366300c76..366300c76 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/StatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/StatementImpl.java
index c9116e3d9..c9116e3d9 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/StatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/StatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/StringLiteralImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/StringLiteralImpl.java
index 58a3dfac7..58a3dfac7 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/StringLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/StringLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperConstructorInvocationImpl.java
index 667bba010..667bba010 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperFieldAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperFieldAccessImpl.java
index 3644358a3..3644358a3 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperFieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperFieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperMethodInvocationImpl.java
index 378fec0da..378fec0da 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SuperMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchCaseImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchCaseImpl.java
index fd10ec0e8..fd10ec0e8 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchCaseImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchCaseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchStatementImpl.java
index dc4106582..dc4106582 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SwitchStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SynchronizedStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SynchronizedStatementImpl.java
index 6a607cf1a..6a607cf1a 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/SynchronizedStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/SynchronizedStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TagElementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TagElementImpl.java
index 36835ce1b..36835ce1b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TagElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TagElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TextElementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TextElementImpl.java
index 6dc61d233..6dc61d233 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TextElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TextElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ThisExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ThisExpressionImpl.java
index 23fcf6fb8..23fcf6fb8 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ThisExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ThisExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ThrowStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ThrowStatementImpl.java
index 3937151e7..3937151e7 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/ThrowStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/ThrowStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TryStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TryStatementImpl.java
index 021629b05..021629b05 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TryStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TryStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeAccessImpl.java
index d792c919f..d792c919f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationImpl.java
index ecda54c3c..ecda54c3c 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationStatementImpl.java
index 1e4fdd313..1e4fdd313 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeImpl.java
index 7ff2e79c6..7ff2e79c6 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeLiteralImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeLiteralImpl.java
index a90cb65a1..a90cb65a1 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeParameterImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeParameterImpl.java
index 4706fdb76..4706fdb76 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/TypeParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationDeclarationImpl.java
index 10281c240..10281c240 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
index 149587870..149587870 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedClassDeclarationImpl.java
index 8a45cdec7..8a45cdec7 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedEnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedEnumDeclarationImpl.java
index df599f10b..df599f10b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedEnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedEnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedInterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedInterfaceDeclarationImpl.java
index a85761661..a85761661 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedInterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedInterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemAccessImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemAccessImpl.java
index b3e02408b..b3e02408b 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemImpl.java
index b3fa0bb69..b3fa0bb69 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedItemImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedLabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedLabeledStatementImpl.java
index bd00500fe..bd00500fe 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedLabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedLabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedMethodDeclarationImpl.java
index ad7701721..ad7701721 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedSingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedSingleVariableDeclarationImpl.java
index 4c5d8431e..4c5d8431e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedSingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedSingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeDeclarationImpl.java
index 2a65b27a3..2a65b27a3 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeImpl.java
index 1928a8973..1928a8973 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedVariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedVariableDeclarationFragmentImpl.java
index b54d4696f..b54d4696f 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedVariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/UnresolvedVariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationExpressionImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationExpressionImpl.java
index 53a39b44e..53a39b44e 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationFragmentImpl.java
index 136392bef..136392bef 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationImpl.java
index 3de9c4cba..3de9c4cba 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationStatementImpl.java
index 7a60875ca..7a60875ca 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/VariableDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/WhileStatementImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/WhileStatementImpl.java
index 337af4f44..337af4f44 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/WhileStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/WhileStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/WildCardTypeImpl.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/WildCardTypeImpl.java
index ac10cbbf8..ac10cbbf8 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/WildCardTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/WildCardTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/java.ecore b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/java.ecore
index d9a905a9a..d9a905a9a 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/impl/java.ecore
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/impl/java.ecore
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/util/JavaAdapterFactory.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/util/JavaAdapterFactory.java
index 5b240653c..5b240653c 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/util/JavaAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/util/JavaAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/util/JavaSwitch.java b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/util/JavaSwitch.java
index 560c04491..560c04491 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/src/org/eclipse/gmt/modisco/java/emf/classic/util/JavaSwitch.java
+++ b/org.eclipse.gmt.modisco.java.classiceobject/src-gen/org/eclipse/gmt/modisco/java/emf/classic/util/JavaSwitch.java
diff --git a/org.eclipse.gmt.modisco.java.generation/.checkstyle b/org.eclipse.gmt.modisco.java.generation/.checkstyle
index 20429fccc..9ab6ee298 100644
--- a/org.eclipse.gmt.modisco.java.generation/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.generation/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/Activator.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/Activator.java
index 9c9359aaa..aa4355ebd 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/Activator.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/Activator.java
@@ -15,7 +15,7 @@ import org.osgi.framework.BundleContext;
 

 /**

  * The activator class controls the plug-in life cycle.

- * 

+ *

  * @author <a href="mailto:jonathan.musset@obeo.fr">Jonathan Musset</a>

  */

 public class Activator extends Plugin {

@@ -39,7 +39,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -50,7 +50,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -61,7 +61,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance.

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java
index 3cde2a799..f5c68088c 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJava.java
@@ -4,7 +4,7 @@
  * 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:

  *     Obeo - initial API and implementation

  *******************************************************************************/

@@ -38,7 +38,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	 * @generated

 	 */

 	public static final String MODULE_FILE_NAME = "/org/eclipse/gmt/modisco/java/generation/files/GenerateJava"; //$NON-NLS-1$

-	

+

 	/**

 	 * The name of the templates that are to be generated.

 	 *

@@ -73,7 +73,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 

 	/**

 	 * This allows clients to instantiates a generator with all required information.

-	 * 

+	 *

 	 * @param modelURI

 	 *            URI where the model on which this generator will be used is located.

 	 * @param targetFolder

@@ -94,7 +94,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 

 	/**

 	 * This allows clients to instantiates a generator with all required information.

-	 * 

+	 *

 	 * @param model

 	 *            We'll iterate over the content of this element to find Objects matching the first parameter

 	 *            of the template we need to call.

@@ -112,10 +112,10 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 			List<? extends Object> arguments) throws IOException {
         initialize(model, targetFolder, arguments);
     }

-	

+

 	/**

 	 * This can be used to launch the generation from a standalone application.

-	 * 

+	 *

 	 * @param args

 	 *            Arguments of the generation.

 	 * @generated

@@ -127,9 +127,9 @@ public class GenerateJava extends AbstractAcceleoGenerator {
             } else {
                 URI modelURI = URI.createFileURI(args[0]);
                 File folder = new File(args[1]);
-                
+
                 List<String> arguments = new ArrayList<String>();
-                
+
                 /*
                  * If you want to change the content of this method, do NOT forget to change the "@generated"
                  * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
@@ -142,23 +142,23 @@ public class GenerateJava extends AbstractAcceleoGenerator {
                  * If your main template is called on an element of your model and a String, you can
                  * add in "arguments" this "String" attribute.
                  */
-                
+
                 GenerateJava generator = new GenerateJava(modelURI, folder, arguments);
-                
+
                 /*
                  * Add the properties from the launch arguments.
                  * If you want to programmatically add new properties, add them in "propertiesFiles"
                  * You can add the absolute path of a properties files, or even a project relative path.
-                 * If you want to add another "protocol" for your properties files, please override 
+                 * If you want to add another "protocol" for your properties files, please override
                  * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
                  * The behavior of the properties loader service is explained in the Acceleo documentation
                  * (Help -> Help Contents).
                  */
-                 
+
                 for (int i = 2; i < args.length; i++) {
                     generator.addPropertiesFile(args[i]);
                 }
-                
+
                 generator.doGenerate(new BasicMonitor());
             }
         } catch (IOException e) {
@@ -168,7 +168,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 

 	/**

 	 * Launches the generation described by this instance.

-	 * 

+	 *

 	 * @param monitor

 	 *            This will be used to display progress information to the user.

 	 * @throws IOException

@@ -203,10 +203,10 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 
         super.doGenerate(monitor);
     }

-	

+

 	/**

 	 * If this generator needs to listen to text generation events, listeners can be returned from here.

-	 * 

+	 *

 	 * @return List of listeners that are to be notified when text is generated through this launch.

 	 * @generated

 	 */

@@ -221,7 +221,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
          */
         return listeners;
     }

-	

+

 	/**

 	 * If you need to change the way files are generated, this is your entry point.

 	 * <p>

@@ -239,7 +239,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	 * <p>

 	 * All three of these default strategies support merging through JMerge.

 	 * </p>

-	 * 

+	 *

 	 * @return The generation strategy that is to be used for generations launched through this launcher.

 	 * @generated

 	 */

@@ -247,11 +247,11 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	public IAcceleoGenerationStrategy getGenerationStrategy() {
         return super.getGenerationStrategy();
     }

-	

+

 	/**

 	 * This will be called in order to find and load the module that will be launched through this launcher.

 	 * We expect this name not to contain file extension, and the module to be located beside the launcher.

-	 * 

+	 *

 	 * @return The name of the module that is to be launched.

 	 * @generated

 	 */

@@ -259,7 +259,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	public String getModuleName() {
         return MODULE_FILE_NAME;
     }

-	

+

 	/**

 	 * If the module(s) called by this launcher require properties files, return their qualified path from

 	 * here.Take note that the first added properties files will take precedence over subsequent ones if they

@@ -270,7 +270,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	 * named "messages.properties" in package "org.eclipse.acceleo.sample", the path that needs be returned by

 	 * a call to {@link #getProperties()} is "org.eclipse.acceleo.sample.messages".

 	 * </p>

-	 * 

+	 *

 	 * @return The list of properties file we need to add to the generation context.

 	 * @see java.util.ResourceBundle#getBundle(String)

 	 * @generated

@@ -286,37 +286,37 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 
         /*
          * TODO if your generation module requires access to properties files, add their qualified path to the list here.
-         * 
+         *
          * Properties files can be located in an Eclipse plug-in or in the file system (all Acceleo projects are Eclipse
          * plug-in). In order to use properties files located in an Eclipse plugin, you need to add the path of the properties
          * files to the "propertiesFiles" list:
-         * 
+         *
          * final String prefix = "platform:/plugin/";
          * final String pluginName = "org.eclipse.acceleo.module.sample";
          * final String packagePath = "/org/eclipse/acceleo/module/sample/properties/";
          * final String fileName = "default.properties";
          * propertiesFiles.add(prefix + pluginName + packagePath + fileName);
-         * 
+         *
          * With this mechanism, you can load properties files from your plugin or from another plugin.
-         * 
+         *
          * You may want to load properties files from the file system, for that you need to add the absolute path of the file:
-         * 
+         *
          * propertiesFiles.add("C:\Users\MyName\MyFile.properties");
-         * 
+         *
          * If you want to let your users add properties files located in the same folder as the model:
          *
-         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) { 
+         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) {
          *     propertiesFiles.addAll(AcceleoEngineUtils.getPropertiesFilesNearModel(model.eResource()));
          * }
-         * 
+         *
          * To learn more about Properties Files, have a look at the Acceleo documentation (Help -> Help Contents).
          */
         return propertiesFiles;
     }

-	

+

 	/**
      * Adds a properties file in the list of properties files.
-     * 
+     *
      * @param propertiesFile
      *            The properties file to add.
      * @generated NOT
@@ -329,7 +329,7 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 

   /**

 	 * This will be used to get the list of templates that are to be launched by this launcher.

-	 * 

+	 *

 	 * @return The list of templates to call on the module {@link #getModuleName()}.

 	 * @generated

 	 */

@@ -337,10 +337,10 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	public String[] getTemplateNames() {
         return TEMPLATE_NAMES;
     }

-	

+

 	/**

 	 * This can be used to update the resource set's package registry with all needed EPackages.

-	 * 

+	 *

 	 * @param resourceSet

 	 *            The resource set which registry has to be updated.

 	 * @generated

@@ -348,43 +348,43 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 	@Override

 	public void registerPackages(ResourceSet resourceSet) {
         super.registerPackages(resourceSet);
-        
+
         /*
          * If you want to change the content of this method, do NOT forget to change the "@generated"
          * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
          * of the Acceleo module with the main template that has caused the creation of this class will
          * revert your modifications.
          */
-        
+
         /*
          * If you need additional package registrations, you can register them here. The following line
          * (in comment) is an example of the package registration for UML.
-         * 
+         *
          * You can use the method  "isInWorkspace(Class c)" to check if the package that you are about to
          * register is in the workspace.
-         * 
+         *
          * To register a package properly, please follow the following conventions:
          *
          * If the package is located in another plug-in, already installed in Eclipse. The following content should
          * have been generated at the beginning of this method. Do not register the package using this mechanism if
          * the metamodel is located in the workspace.
-         *  
+         *
          * if (!isInWorkspace(UMLPackage.class)) {
          *     // The normal package registration if your metamodel is in a plugin.
          *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
          * }
-         * 
+         *
          * If the package is located in another project in your workspace, the plugin containing the package has not
          * been register by EMF and Acceleo should register it automatically. If you want to use the generator in
          * stand alone, the regular registration (seen a couple lines before) is needed.
-         * 
+         *
          * To learn more about Package Registration, have a look at the Acceleo documentation (Help -> Help Contents).
          */
     }

 

 	/**

 	 * This can be used to update the resource set's resource factory registry with all needed factories.

-	 * 

+	 *

 	 * @param resourceSet

 	 *            The resource set which registry has to be updated.

 	 * @generated

@@ -398,19 +398,19 @@ public class GenerateJava extends AbstractAcceleoGenerator {
          * of the Acceleo module with the main template that has caused the creation of this class will
          * revert your modifications.
          */
-        
+
         /*
          * TODO If you need additional resource factories registrations, you can register them here. the following line
          * (in comment) is an example of the resource factory registration for UML.
          *
          * If you want to use the generator in stand alone, the resource factory registration will be required.
-         *  
-         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents). 
-         */ 
-        
+         *
+         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents).
+         */
+
         // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
     }

-	

+

 	/**

 	 * @generated NOT

 	 */

@@ -419,5 +419,5 @@ public class GenerateJava extends AbstractAcceleoGenerator {
 		return URI.createURI(entry);

 	}

 

-	

+

 }

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJavaExtended.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJavaExtended.java
index 3ec3c546b..902ee63a1 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJavaExtended.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/GenerateJavaExtended.java
@@ -23,7 +23,7 @@ import org.eclipse.gmt.modisco.java.generation.Messages;
 import org.eclipse.gmt.modisco.java.generation.utils.JavaUtils;

 

 /**

- * 

+ *

  * Entry point of the 'GenerateJava' generation module with additional post action : Java formatting.

  * @see GenerateJava

  *

@@ -47,17 +47,17 @@ public class GenerateJavaExtended extends GenerateJava {
 	@Override

 	public void doGenerate(Monitor monitor) throws IOException {

 		super.doGenerate(monitor);

-		

+

 		// apply default java code formatting to generated files

 	    if (monitor != null) {

 	    	monitor.setTaskName(Messages.Generate_JavaStructures_0);

 	    }

 		JavaUtils.formatJavaCode(this.targetFolder);

 	}

-	

+

 	/**

 	 * This can be used to launch the generation from a standalone application.

-	 * 

+	 *

 	 * @param args

 	 *            Arguments of the generation.

 	 */

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Generate_JavaStructures.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Generate_JavaStructures.java
index cce9ac10d..9962599e6 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Generate_JavaStructures.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/files/Generate_JavaStructures.java
@@ -23,7 +23,7 @@ import org.eclipse.gmt.modisco.java.generation.Messages;
 import org.eclipse.gmt.modisco.java.generation.utils.JavaUtils;

 

 /**

- * 

+ *

  * @deprecated use GenerateJavaExtended

  *

  */

@@ -51,7 +51,7 @@ public class Generate_JavaStructures extends GenerateJavaExtended {
 

 	/**

 	 * This can be used to launch the generation from a standalone application.

-	 * 

+	 *

 	 * @param args

 	 *            Arguments of the generation.

 	 */

diff --git a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/utils/JavaUtils.java b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/utils/JavaUtils.java
index 2742aa1f9..412aa95e8 100644
--- a/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/utils/JavaUtils.java
+++ b/org.eclipse.gmt.modisco.java.generation/src/org/eclipse/gmt/modisco/java/generation/utils/JavaUtils.java
@@ -23,9 +23,9 @@ import org.eclipse.gmt.modisco.java.generation.Messages;
 

 /**

  * Util Class for formatting Java code.

- * 

+ *

  * @author fgiquel

- * 

+ *

  */

 public final class JavaUtils {

 

@@ -36,7 +36,7 @@ public final class JavaUtils {
 

 	/**

 	 * Formats java source for a hierarchy.

-	 * 

+	 *

 	 * @param directory

 	 */

 	public static void formatJavaCode(final File directory) {

diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/.checkstyle b/org.eclipse.gmt.modisco.java.nousages.cdo/.checkstyle
index 7879d8220..50fe5c4d6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/.checkstyle
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/java/nousages/cdo/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/nousages/cdo/meta"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/nousages/cdo/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/.classpath b/org.eclipse.gmt.modisco.java.nousages.cdo/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/.classpath
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/build.properties b/org.eclipse.gmt.modisco.java.nousages.cdo/build.properties
index 0d096a139..280efb25b 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/build.properties
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -15,6 +16,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/model/java.genmodel b/org.eclipse.gmt.modisco.java.nousages.cdo/model/java.genmodel
index b648244a4..e9f70e740 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/model/java.genmodel
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/model/java.genmodel
@@ -1,8 +1,8 @@
 <?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;&#xD;&#xA;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.gmt.modisco.java.nousages.cdo/src" modelPluginID="org.eclipse.gmt.modisco.java.nousages.cdo"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009, 2018 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen" modelPluginID="org.eclipse.gmt.modisco.java.nousages.cdo"

     modelName="Java" rootExtendsInterface="org.eclipse.emf.cdo.CDOObject" rootExtendsClass="org.eclipse.emf.internal.cdo.CDOObjectImpl"

     reflectiveDelegation="true" importerID="org.eclipse.emf.importer.cdo" featureDelegation="Reflective"

     complianceLevel="6.0" copyrightFields="false">

diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ASTNode.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ASTNode.java
index 5b1b6a413..5b1b6a413 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ASTNode.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ASTNode.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
index 6e9fb9f6b..6e9fb9f6b 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
index a1d541872..a1d541872 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
index 6091ec752..6091ec752 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
index 3805ce509..3805ce509 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
index 595cfc8c8..595cfc8c8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Annotation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Annotation.java
index 47d2f40e1..47d2f40e1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Annotation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Annotation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
index af96a28df..af96a28df 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
index cc870d40a..cc870d40a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
index 333e663f8..333e663f8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
index 44d23df44..44d23df44 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Archive.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Archive.java
index 2cdabe134..2cdabe134 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Archive.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Archive.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayAccess.java
index 659835c9d..659835c9d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayCreation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayCreation.java
index d6b0ff421..d6b0ff421 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayCreation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayCreation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayInitializer.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayInitializer.java
index bc2172d6a..bc2172d6a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayInitializer.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayInitializer.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
index b6cecf205..b6cecf205 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayType.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayType.java
index 63f561cb5..63f561cb5 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ArrayType.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ArrayType.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AssertStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AssertStatement.java
index c3c723663..c3c723663 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AssertStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AssertStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Assignment.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Assignment.java
index b21b9ea7b..b21b9ea7b 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Assignment.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Assignment.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AssignmentKind.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AssignmentKind.java
index f38171129..f38171129 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/AssignmentKind.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/AssignmentKind.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Block.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Block.java
index 94852bfac..94852bfac 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Block.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Block.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BlockComment.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BlockComment.java
index 3ec1f8a23..3ec1f8a23 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BlockComment.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BlockComment.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BodyDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BodyDeclaration.java
index a45b7c423..a45b7c423 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BodyDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BodyDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BooleanLiteral.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BooleanLiteral.java
index 3bf6742cc..3bf6742cc 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BooleanLiteral.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BooleanLiteral.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BreakStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BreakStatement.java
index 7f5f98094..7f5f98094 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/BreakStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/BreakStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CastExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CastExpression.java
index 562aab73b..562aab73b 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CastExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CastExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CatchClause.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CatchClause.java
index 99efeaad4..99efeaad4 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CatchClause.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CatchClause.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CharacterLiteral.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CharacterLiteral.java
index 66990db74..66990db74 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CharacterLiteral.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CharacterLiteral.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ClassDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ClassDeclaration.java
index 7fa9381a1..7fa9381a1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ClassDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ClassDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ClassFile.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ClassFile.java
index ddb7873d7..ddb7873d7 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ClassFile.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ClassFile.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
index a6c7ba417..a6c7ba417 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Comment.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Comment.java
index e5ec27344..e5ec27344 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Comment.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Comment.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CompilationUnit.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CompilationUnit.java
index dff7c4c35..dff7c4c35 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/CompilationUnit.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/CompilationUnit.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ConditionalExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ConditionalExpression.java
index 41bedfc75..41bedfc75 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ConditionalExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ConditionalExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
index f3801d3d7..f3801d3d7 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
index 1a0449be5..1a0449be5 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ContinueStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ContinueStatement.java
index fa8803c99..fa8803c99 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ContinueStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ContinueStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/DoStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/DoStatement.java
index 4b2e1976c..4b2e1976c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/DoStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/DoStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EmptyStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EmptyStatement.java
index 198b440b0..198b440b0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EmptyStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EmptyStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
index 8bb8b643e..8bb8b643e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
index 741e3ba0a..741e3ba0a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EnumDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EnumDeclaration.java
index 5db9e1271..5db9e1271 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/EnumDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/EnumDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Expression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Expression.java
index ae2da5dcd..ae2da5dcd 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Expression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Expression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ExpressionStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ExpressionStatement.java
index dacbb4908..dacbb4908 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ExpressionStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ExpressionStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/FieldAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/FieldAccess.java
index 4b8fb1731..4b8fb1731 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/FieldAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/FieldAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/FieldDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/FieldDeclaration.java
index 0e7292e11..0e7292e11 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/FieldDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/FieldDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ForStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ForStatement.java
index 025955c84..025955c84 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ForStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ForStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/IfStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/IfStatement.java
index ce0dd2e22..ce0dd2e22 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/IfStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/IfStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ImportDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ImportDeclaration.java
index bbbcfe125..bbbcfe125 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ImportDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ImportDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InfixExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InfixExpression.java
index 7e229c907..7e229c907 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InfixExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InfixExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
index 6bb365865..6bb365865 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InheritanceKind.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InheritanceKind.java
index 764bffc9c..764bffc9c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InheritanceKind.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InheritanceKind.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Initializer.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Initializer.java
index 27fbae347..27fbae347 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Initializer.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Initializer.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InstanceofExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InstanceofExpression.java
index 656e1c699..656e1c699 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InstanceofExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InstanceofExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
index 6af183c27..6af183c27 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Javadoc.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Javadoc.java
index 074c041b2..074c041b2 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Javadoc.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Javadoc.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/LabeledStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/LabeledStatement.java
index becc614c6..becc614c6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/LabeledStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/LabeledStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/LineComment.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/LineComment.java
index 8977f134e..8977f134e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/LineComment.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/LineComment.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Manifest.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Manifest.java
index e406fb58e..e406fb58e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Manifest.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Manifest.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ManifestAttribute.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ManifestAttribute.java
index 35c02adce..35c02adce 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ManifestAttribute.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ManifestAttribute.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ManifestEntry.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ManifestEntry.java
index 749a87db0..749a87db0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ManifestEntry.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ManifestEntry.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MemberRef.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MemberRef.java
index eecb2a4a0..eecb2a4a0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MemberRef.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MemberRef.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodDeclaration.java
index 0e85f56b6..0e85f56b6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodInvocation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodInvocation.java
index bb1a1b2ed..bb1a1b2ed 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodInvocation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodInvocation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodRef.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodRef.java
index 700f4e569..700f4e569 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodRef.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodRef.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodRefParameter.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodRefParameter.java
index 4915f3101..4915f3101 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/MethodRefParameter.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/MethodRefParameter.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Model.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Model.java
index 0902d60b2..0902d60b2 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Model.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Model.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Modifier.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Modifier.java
index 4f8315303..4f8315303 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Modifier.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Modifier.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NamedElement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NamedElement.java
index c8f47693e..c8f47693e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NamedElement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NamedElement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NamespaceAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NamespaceAccess.java
index f822d2b04..f822d2b04 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NamespaceAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NamespaceAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NullLiteral.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NullLiteral.java
index 2898bb0b3..2898bb0b3 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NullLiteral.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NullLiteral.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NumberLiteral.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NumberLiteral.java
index db8aaf488..db8aaf488 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/NumberLiteral.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/NumberLiteral.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Package.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Package.java
index 44e96a36e..44e96a36e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Package.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Package.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PackageAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PackageAccess.java
index 1cd0bc75c..1cd0bc75c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PackageAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PackageAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ParameterizedType.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ParameterizedType.java
index df3287f3c..df3287f3c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ParameterizedType.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ParameterizedType.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
index becbc6b3d..becbc6b3d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PostfixExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PostfixExpression.java
index f5c2ac283..f5c2ac283 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PostfixExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PostfixExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
index 771166042..771166042 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrefixExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrefixExpression.java
index cac3d8755..cac3d8755 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrefixExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrefixExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
index ae4050101..ae4050101 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveType.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveType.java
index fa68490ce..fa68490ce 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveType.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveType.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
index 4dcdf398c..4dcdf398c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
index 7dacf085d..7dacf085d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
index 3daf3c6bc..3daf3c6bc 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
index e8c744ced..e8c744ced 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
index de6bf832f..de6bf832f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
index 3c36499b0..3c36499b0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
index fc3d41501..fc3d41501 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
index ad0eb6d4a..ad0eb6d4a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
index 8e60dc595..8e60dc595 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ReturnStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ReturnStatement.java
index 82a6b19c1..82a6b19c1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ReturnStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ReturnStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
index b042122bd..b042122bd 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
index 1ce4a9d61..1ce4a9d61 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Statement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Statement.java
index a42046d65..a42046d65 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Statement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Statement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/StringLiteral.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/StringLiteral.java
index ce3549d44..ce3549d44 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/StringLiteral.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/StringLiteral.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
index 1d3ab15e7..1d3ab15e7 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
index 933e3dd6e..933e3dd6e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
index 06066d1df..06066d1df 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SwitchCase.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SwitchCase.java
index 42ff16f07..42ff16f07 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SwitchCase.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SwitchCase.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SwitchStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SwitchStatement.java
index 25d7c8c52..25d7c8c52 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SwitchStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SwitchStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
index 54fdf27f9..54fdf27f9 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TagElement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TagElement.java
index f6991f0d8..f6991f0d8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TagElement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TagElement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TextElement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TextElement.java
index ef954dc9a..ef954dc9a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TextElement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TextElement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ThisExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ThisExpression.java
index 198f3a4d8..198f3a4d8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ThisExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ThisExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ThrowStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ThrowStatement.java
index 711e7a845..711e7a845 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/ThrowStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/ThrowStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TryStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TryStatement.java
index ae556aaac..ae556aaac 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TryStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TryStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Type.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Type.java
index 0d088b51f..0d088b51f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/Type.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/Type.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeAccess.java
index d0dca2e84..d0dca2e84 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeDeclaration.java
index bad91247e..bad91247e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
index 10e03c89e..10e03c89e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeLiteral.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeLiteral.java
index f01deb4e5..f01deb4e5 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeLiteral.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeLiteral.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeParameter.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeParameter.java
index 3b0d76e95..3b0d76e95 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/TypeParameter.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/TypeParameter.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
index 11553cbd4..11553cbd4 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
index f2bbc3e38..f2bbc3e38 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
index 111b74dd0..111b74dd0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
index d60d3d4ac..d60d3d4ac 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
index 90e5fe8b3..90e5fe8b3 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedItem.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItem.java
index 88e3e9907..88e3e9907 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedItem.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItem.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
index dbfcfaa81..dbfcfaa81 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
index cd81df84f..cd81df84f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
index afa04ef00..afa04ef00 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
index a93538553..a93538553 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedType.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedType.java
index e3b45cb11..e3b45cb11 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedType.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedType.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
index 927d12ac2..927d12ac2 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
index 980c33c56..980c33c56 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclaration.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclaration.java
index f1229f09c..f1229f09c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclaration.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
index 7944de2d3..7944de2d3 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
index bf921209d..bf921209d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
index eb27407cc..eb27407cc 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VisibilityKind.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VisibilityKind.java
index 7953e23cc..7953e23cc 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/VisibilityKind.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/VisibilityKind.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/WhileStatement.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/WhileStatement.java
index 37aab715f..37aab715f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/WhileStatement.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/WhileStatement.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/WildCardType.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/WildCardType.java
index 7ebdff410..7ebdff410 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/WildCardType.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/WildCardType.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ASTNodeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ASTNodeImpl.java
index 6cb128de1..6cb128de1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ASTNodeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ASTNodeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodDeclarationImpl.java
index 91587128f..91587128f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodInvocationImpl.java
index 0adeb2a7d..0adeb2a7d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeDeclarationImpl.java
index 20af0ba9e..20af0ba9e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeQualifiedExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeQualifiedExpressionImpl.java
index 69f77a7cb..69f77a7cb 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeQualifiedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractTypeQualifiedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractVariablesContainerImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractVariablesContainerImpl.java
index e9f69c266..e9f69c266 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractVariablesContainerImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AbstractVariablesContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationImpl.java
index d9d003ed4..d9d003ed4 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationMemberValuePairImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationMemberValuePairImpl.java
index 79d87e101..79d87e101 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationMemberValuePairImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationMemberValuePairImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeDeclarationImpl.java
index e709308a9..e709308a9 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeMemberDeclarationImpl.java
index f5e4d927a..f5e4d927a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnonymousClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnonymousClassDeclarationImpl.java
index c6e44728c..c6e44728c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnonymousClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AnonymousClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArchiveImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArchiveImpl.java
index 966932efb..966932efb 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArchiveImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArchiveImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayAccessImpl.java
index d45e893a9..d45e893a9 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayCreationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayCreationImpl.java
index 98e2cd6f9..98e2cd6f9 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayInitializerImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayInitializerImpl.java
index edf61bd4f..edf61bd4f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayInitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayInitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayLengthAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayLengthAccessImpl.java
index bcd1a79bc..bcd1a79bc 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayLengthAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayLengthAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayTypeImpl.java
index ed0cc0ff4..ed0cc0ff4 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssertStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssertStatementImpl.java
index f3f4042bf..f3f4042bf 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssertStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssertStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssignmentImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssignmentImpl.java
index dd8f85362..dd8f85362 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssignmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/AssignmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockCommentImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockCommentImpl.java
index c1e6d6be5..c1e6d6be5 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockImpl.java
index de9161663..de9161663 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BlockImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BodyDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BodyDeclarationImpl.java
index 4910913e1..4910913e1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BodyDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BodyDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BooleanLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BooleanLiteralImpl.java
index 442b21643..442b21643 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BooleanLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BooleanLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BreakStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BreakStatementImpl.java
index d57d75a56..d57d75a56 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BreakStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/BreakStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CastExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CastExpressionImpl.java
index 5ddeea788..5ddeea788 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CastExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CastExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CatchClauseImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CatchClauseImpl.java
index 43b7ec412..43b7ec412 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CatchClauseImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CatchClauseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CharacterLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CharacterLiteralImpl.java
index 8fd759f9f..8fd759f9f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CharacterLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CharacterLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassDeclarationImpl.java
index ebb3b2987..ebb3b2987 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassFileImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassFileImpl.java
index 6a24c0833..6a24c0833 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassFileImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassFileImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassInstanceCreationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassInstanceCreationImpl.java
index d534f048e..d534f048e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassInstanceCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ClassInstanceCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CommentImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CommentImpl.java
index 8782ed5ff..8782ed5ff 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CompilationUnitImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CompilationUnitImpl.java
index 4b64fdd18..4b64fdd18 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CompilationUnitImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConditionalExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConditionalExpressionImpl.java
index 2acf00704..2acf00704 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConditionalExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorDeclarationImpl.java
index 7f46dc28f..7f46dc28f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorInvocationImpl.java
index 792bf4f3f..792bf4f3f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ContinueStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ContinueStatementImpl.java
index c28c76c39..c28c76c39 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ContinueStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ContinueStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/DoStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/DoStatementImpl.java
index e633d12ae..e633d12ae 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/DoStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/DoStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EmptyStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EmptyStatementImpl.java
index 4fa371c06..4fa371c06 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EmptyStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EmptyStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnhancedForStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnhancedForStatementImpl.java
index 0c44a117a..0c44a117a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnhancedForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnhancedForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumConstantDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumConstantDeclarationImpl.java
index 9ad3d4549..9ad3d4549 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumConstantDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumConstantDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumDeclarationImpl.java
index 8e53832ee..8e53832ee 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/EnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionImpl.java
index 2e15e40d6..2e15e40d6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionStatementImpl.java
index a87111e85..a87111e85 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ExpressionStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldAccessImpl.java
index f439d8e79..f439d8e79 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldDeclarationImpl.java
index 8cc3cebfe..8cc3cebfe 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/FieldDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ForStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ForStatementImpl.java
index 154150232..154150232 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/IfStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/IfStatementImpl.java
index f6526f588..f6526f588 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/IfStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/IfStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ImportDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ImportDeclarationImpl.java
index a09f421b8..a09f421b8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ImportDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ImportDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InfixExpressionImpl.java
index a765718a8..a765718a8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InitializerImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InitializerImpl.java
index a0ff250d5..a0ff250d5 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InstanceofExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InstanceofExpressionImpl.java
index 3051e15a6..3051e15a6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InstanceofExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InstanceofExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InterfaceDeclarationImpl.java
index ec9b50957..ec9b50957 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/InterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaFactoryImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaFactoryImpl.java
index 9f60e9221..9f60e9221 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaPackageImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaPackageImpl.java
index d387f8490..d387f8490 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaPackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavaPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavadocImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavadocImpl.java
index 4a498c8c1..4a498c8c1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavadocImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/JavadocImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LabeledStatementImpl.java
index 8a5dd1b8c..8a5dd1b8c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LineCommentImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LineCommentImpl.java
index 5e0c7bd62..5e0c7bd62 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LineCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/LineCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestAttributeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestAttributeImpl.java
index f567c2975..f567c2975 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestEntryImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestEntryImpl.java
index bbcde296e..bbcde296e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestEntryImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestEntryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestImpl.java
index 4d79c8aa6..4d79c8aa6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ManifestImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MemberRefImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MemberRefImpl.java
index e16855b67..e16855b67 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MemberRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MemberRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodDeclarationImpl.java
index 0b63ede22..0b63ede22 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodInvocationImpl.java
index 4ea1ce61c..4ea1ce61c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefImpl.java
index 6bbca682d..6bbca682d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefParameterImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefParameterImpl.java
index 35c1cdb2f..35c1cdb2f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/MethodRefParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModelImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModelImpl.java
index 916811f58..916811f58 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModelImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModelImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModifierImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModifierImpl.java
index ce36ac9d3..ce36ac9d3 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModifierImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ModifierImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamedElementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamedElementImpl.java
index 2ad008d52..2ad008d52 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamedElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamedElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamespaceAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamespaceAccessImpl.java
index 8440ecb58..8440ecb58 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamespaceAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NamespaceAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NullLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NullLiteralImpl.java
index f865322d0..f865322d0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NullLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NullLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NumberLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NumberLiteralImpl.java
index f6448cdab..f6448cdab 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NumberLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/NumberLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageAccessImpl.java
index f536357c4..f536357c4 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageImpl.java
index de9d0c368..de9d0c368 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParameterizedTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParameterizedTypeImpl.java
index 7215fe5d9..7215fe5d9 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParameterizedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParameterizedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParenthesizedExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParenthesizedExpressionImpl.java
index e7a602173..e7a602173 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParenthesizedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ParenthesizedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PostfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PostfixExpressionImpl.java
index e752a00ed..e752a00ed 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PostfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PostfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrefixExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrefixExpressionImpl.java
index 2ebf84b0f..2ebf84b0f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrefixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrefixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeBooleanImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeBooleanImpl.java
index 69dc81f85..69dc81f85 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeBooleanImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeBooleanImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeByteImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeByteImpl.java
index cf717f85a..cf717f85a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeByteImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeByteImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeCharImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeCharImpl.java
index 018ca2b55..018ca2b55 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeCharImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeCharImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeDoubleImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeDoubleImpl.java
index 037c7b448..037c7b448 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeDoubleImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeDoubleImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeFloatImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeFloatImpl.java
index 95f79723e..95f79723e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeFloatImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeFloatImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeImpl.java
index ee295ba70..ee295ba70 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeIntImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeIntImpl.java
index 151ba0342..151ba0342 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeIntImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeIntImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeLongImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeLongImpl.java
index bf6b7e392..bf6b7e392 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeLongImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeLongImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeShortImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeShortImpl.java
index 719d43732..719d43732 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeShortImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeShortImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeVoidImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeVoidImpl.java
index b91c6447c..b91c6447c 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeVoidImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/PrimitiveTypeVoidImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ReturnStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ReturnStatementImpl.java
index 0b925b23a..0b925b23a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ReturnStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ReturnStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableAccessImpl.java
index 74d859e54..74d859e54 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableDeclarationImpl.java
index 196803f8d..196803f8d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StatementImpl.java
index 3eb493548..3eb493548 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StringLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StringLiteralImpl.java
index 6e36d2837..6e36d2837 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StringLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/StringLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperConstructorInvocationImpl.java
index 435d9005a..435d9005a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperFieldAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperFieldAccessImpl.java
index 32f4cb3bd..32f4cb3bd 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperFieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperFieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperMethodInvocationImpl.java
index b576dada5..b576dada5 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SuperMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchCaseImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchCaseImpl.java
index 9f412ed13..9f412ed13 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchCaseImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchCaseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchStatementImpl.java
index ad12ef2bf..ad12ef2bf 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SwitchStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SynchronizedStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SynchronizedStatementImpl.java
index abff2bc19..abff2bc19 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SynchronizedStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/SynchronizedStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TagElementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TagElementImpl.java
index e806e11c7..e806e11c7 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TagElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TagElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TextElementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TextElementImpl.java
index 47fa151e6..47fa151e6 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TextElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TextElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThisExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThisExpressionImpl.java
index 44225b984..44225b984 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThisExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThisExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThrowStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThrowStatementImpl.java
index fb4852a44..fb4852a44 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThrowStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/ThrowStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TryStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TryStatementImpl.java
index acf6c9d34..acf6c9d34 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TryStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TryStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeAccessImpl.java
index eab868091..eab868091 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationImpl.java
index 3fbcf74d9..3fbcf74d9 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationStatementImpl.java
index 24c24d46e..24c24d46e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeImpl.java
index 1eb1c11ec..1eb1c11ec 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeLiteralImpl.java
index bcee22679..bcee22679 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeParameterImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeParameterImpl.java
index 78823fe48..78823fe48 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/TypeParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationDeclarationImpl.java
index 57599aa4a..57599aa4a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
index 0663e5473..0663e5473 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedClassDeclarationImpl.java
index e9286bf8b..e9286bf8b 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedEnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedEnumDeclarationImpl.java
index 2f4886eca..2f4886eca 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedEnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedEnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedInterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedInterfaceDeclarationImpl.java
index e8a9e592d..e8a9e592d 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedInterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedInterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemAccessImpl.java
index f8cdaca3e..f8cdaca3e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemImpl.java
index f0b9fb10b..f0b9fb10b 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedItemImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedLabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedLabeledStatementImpl.java
index fa98e9d6a..fa98e9d6a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedLabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedLabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedMethodDeclarationImpl.java
index a2cf066e0..a2cf066e0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java
index b22e73f1e..b22e73f1e 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedSingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeDeclarationImpl.java
index ac93ab770..ac93ab770 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeImpl.java
index 953a6e935..953a6e935 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java
index 5ed7d93c1..5ed7d93c1 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/UnresolvedVariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationExpressionImpl.java
index 0fd3811e2..0fd3811e2 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationFragmentImpl.java
index 11ea31a69..11ea31a69 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationImpl.java
index b7d537923..b7d537923 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationStatementImpl.java
index e46ef3a38..e46ef3a38 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/VariableDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WhileStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WhileStatementImpl.java
index b8900c869..b8900c869 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WhileStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WhileStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WildCardTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WildCardTypeImpl.java
index 7b2a2bd5f..7b2a2bd5f 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WildCardTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/WildCardTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/java.ecore b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/java.ecore
index 31001f54a..31001f54a 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/impl/java.ecore
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/impl/java.ecore
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaFactory.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaFactory.java
index 59d6a17f8..59d6a17f8 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaFactory.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaFactory.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaPackage.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaPackage.java
index 0921a1dd0..0921a1dd0 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaPackage.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/meta/JavaPackage.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaAdapterFactory.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaAdapterFactory.java
index 6d5c3f782..6d5c3f782 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaSwitch.java b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaSwitch.java
index fc4771547..fc4771547 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/src/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaSwitch.java
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/src-gen/org/eclipse/gmt/modisco/java/nousages/cdo/util/JavaSwitch.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/.checkstyle b/org.eclipse.gmt.modisco.java.nousages/.checkstyle
index 90bf07685..50fe5c4d6 100644
--- a/org.eclipse.gmt.modisco.java.nousages/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.nousages/.checkstyle
@@ -1,14 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/java/nousages/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/nousages/meta"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/nousages/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.java.nousages/.classpath b/org.eclipse.gmt.modisco.java.nousages/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.java.nousages/.classpath
+++ b/org.eclipse.gmt.modisco.java.nousages/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.java.nousages/build.properties b/org.eclipse.gmt.modisco.java.nousages/build.properties
index 0d096a139..280efb25b 100644
--- a/org.eclipse.gmt.modisco.java.nousages/build.properties
+++ b/org.eclipse.gmt.modisco.java.nousages/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -15,6 +16,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.java.nousages/model/java.genmodel b/org.eclipse.gmt.modisco.java.nousages/model/java.genmodel
index 5eeb94835..8294ae786 100644
--- a/org.eclipse.gmt.modisco.java.nousages/model/java.genmodel
+++ b/org.eclipse.gmt.modisco.java.nousages/model/java.genmodel
@@ -1,8 +1,8 @@
 <?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;&#xD;&#xA;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.gmt.modisco.java.nousages/src" modelPluginID="org.eclipse.gmt.modisco.java.nousages"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009,2018 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.java.nousages/src-gen" modelPluginID="org.eclipse.gmt.modisco.java.nousages"

     modelName="Java" importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0"

     copyrightFields="false">

   <foreignModel>java.ecore</foreignModel>

diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ASTNodeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ASTNodeImpl.java
index bad6352c4..bad6352c4 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ASTNodeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ASTNodeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodDeclarationImpl.java
index 5cf57e57e..5cf57e57e 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodInvocationImpl.java
index e886253c5..e886253c5 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeDeclarationImpl.java
index 915528a60..915528a60 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeQualifiedExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeQualifiedExpressionImpl.java
index bf2cb07ce..bf2cb07ce 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeQualifiedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractTypeQualifiedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractVariablesContainerImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractVariablesContainerImpl.java
index 7368f8f2e..7368f8f2e 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AbstractVariablesContainerImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AbstractVariablesContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationImpl.java
index facbf413a..facbf413a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationMemberValuePairImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationMemberValuePairImpl.java
index 50106f84e..50106f84e 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationMemberValuePairImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationMemberValuePairImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeDeclarationImpl.java
index 55f6faeb2..55f6faeb2 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeMemberDeclarationImpl.java
index c5ef29113..c5ef29113 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnonymousClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnonymousClassDeclarationImpl.java
index 263eaa5d2..263eaa5d2 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AnonymousClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AnonymousClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArchiveImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArchiveImpl.java
index 8f646ea1c..8f646ea1c 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArchiveImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArchiveImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayAccessImpl.java
index ddea7311a..ddea7311a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayCreationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayCreationImpl.java
index 5cfbe5cde..5cfbe5cde 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayInitializerImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayInitializerImpl.java
index c94491224..c94491224 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayInitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayInitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayLengthAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayLengthAccessImpl.java
index 78372aa67..78372aa67 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayLengthAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayLengthAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayTypeImpl.java
index 571dd9fe2..571dd9fe2 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ArrayTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AssertStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AssertStatementImpl.java
index ed261b78f..ed261b78f 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AssertStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AssertStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AssignmentImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AssignmentImpl.java
index 202d884cf..202d884cf 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/AssignmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/AssignmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BlockCommentImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BlockCommentImpl.java
index 2ee22def1..2ee22def1 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BlockCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BlockCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BlockImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BlockImpl.java
index c4766872e..c4766872e 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BlockImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BlockImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BodyDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BodyDeclarationImpl.java
index 1a0edba1d..1a0edba1d 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BodyDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BodyDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BooleanLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BooleanLiteralImpl.java
index 864434703..864434703 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BooleanLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BooleanLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BreakStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BreakStatementImpl.java
index 8d897a616..8d897a616 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/BreakStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/BreakStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CastExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CastExpressionImpl.java
index 0bd4556cf..0bd4556cf 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CastExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CastExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CatchClauseImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CatchClauseImpl.java
index 4b753fee2..4b753fee2 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CatchClauseImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CatchClauseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CharacterLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CharacterLiteralImpl.java
index b0f19184b..b0f19184b 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CharacterLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CharacterLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ClassDeclarationImpl.java
index 7d2e4c049..7d2e4c049 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ClassFileImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ClassFileImpl.java
index 29c0dcd65..29c0dcd65 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ClassFileImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ClassFileImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ClassInstanceCreationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ClassInstanceCreationImpl.java
index f42c59ed6..f42c59ed6 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ClassInstanceCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ClassInstanceCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CommentImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CommentImpl.java
index 35b782fee..35b782fee 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CompilationUnitImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CompilationUnitImpl.java
index 98c6d7f43..98c6d7f43 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/CompilationUnitImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ConditionalExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ConditionalExpressionImpl.java
index 9f8998a35..9f8998a35 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ConditionalExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorDeclarationImpl.java
index f3fb74781..f3fb74781 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorInvocationImpl.java
index 9660a3e36..9660a3e36 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ContinueStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ContinueStatementImpl.java
index 06f6a61fc..06f6a61fc 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ContinueStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ContinueStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/DoStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/DoStatementImpl.java
index 7ac5044b8..7ac5044b8 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/DoStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/DoStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EmptyStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EmptyStatementImpl.java
index 8029c1617..8029c1617 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EmptyStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EmptyStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EnhancedForStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EnhancedForStatementImpl.java
index f72af02d0..f72af02d0 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EnhancedForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EnhancedForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EnumConstantDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EnumConstantDeclarationImpl.java
index 69611f6aa..69611f6aa 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EnumConstantDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EnumConstantDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EnumDeclarationImpl.java
index 95a92d008..95a92d008 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/EnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/EnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionImpl.java
index 3807eca4c..3807eca4c 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionStatementImpl.java
index a6ab1799a..a6ab1799a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ExpressionStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/FieldAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/FieldAccessImpl.java
index 23dda9c19..23dda9c19 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/FieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/FieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/FieldDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/FieldDeclarationImpl.java
index 0171f6c89..0171f6c89 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/FieldDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/FieldDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ForStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ForStatementImpl.java
index 4d4d247eb..4d4d247eb 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/IfStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/IfStatementImpl.java
index a9bd4ab34..a9bd4ab34 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/IfStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/IfStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ImportDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ImportDeclarationImpl.java
index 326f76a73..326f76a73 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ImportDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ImportDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InfixExpressionImpl.java
index 146a693ce..146a693ce 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InitializerImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InitializerImpl.java
index d51dd2310..d51dd2310 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InstanceofExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InstanceofExpressionImpl.java
index c97843c81..c97843c81 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InstanceofExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InstanceofExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InterfaceDeclarationImpl.java
index 3aa0fcabf..3aa0fcabf 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/InterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/InterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/JavaFactoryImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/JavaFactoryImpl.java
index c0560b968..c0560b968 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/JavaFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/JavaFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/JavaPackageImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/JavaPackageImpl.java
index 4f00f8f73..4f00f8f73 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/JavaPackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/JavaPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/JavadocImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/JavadocImpl.java
index 2d1b2b999..2d1b2b999 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/JavadocImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/JavadocImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/LabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/LabeledStatementImpl.java
index 67352bd90..67352bd90 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/LabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/LabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/LineCommentImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/LineCommentImpl.java
index f3e0a3276..f3e0a3276 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/LineCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/LineCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ManifestAttributeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ManifestAttributeImpl.java
index d81edd7b4..d81edd7b4 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ManifestAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ManifestAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ManifestEntryImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ManifestEntryImpl.java
index 6d6b00687..6d6b00687 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ManifestEntryImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ManifestEntryImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ManifestImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ManifestImpl.java
index ae6c497a2..ae6c497a2 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ManifestImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ManifestImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MemberRefImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MemberRefImpl.java
index 7e33a8c4b..7e33a8c4b 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MemberRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MemberRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/Messages.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/Messages.java
index 4c0e7e4be..4c0e7e4be 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/Messages.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/Messages.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodDeclarationImpl.java
index 9b54e96b2..9b54e96b2 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodInvocationImpl.java
index fea37745e..fea37745e 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefImpl.java
index cf75285cc..cf75285cc 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefParameterImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefParameterImpl.java
index d91ebdd1c..d91ebdd1c 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/MethodRefParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ModelImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ModelImpl.java
index ed84046d3..ed84046d3 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ModelImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ModelImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ModifierImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ModifierImpl.java
index 33e07abf4..33e07abf4 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ModifierImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ModifierImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NamedElementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NamedElementImpl.java
index c9b095934..c9b095934 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NamedElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NamedElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NamespaceAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NamespaceAccessImpl.java
index 1c7252c4c..1c7252c4c 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NamespaceAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NamespaceAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NullLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NullLiteralImpl.java
index 69be3ab69..69be3ab69 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NullLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NullLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NumberLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NumberLiteralImpl.java
index bace5e7d1..bace5e7d1 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/NumberLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/NumberLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PackageAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PackageAccessImpl.java
index 51e539afa..51e539afa 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PackageAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PackageAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PackageImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PackageImpl.java
index e5f555688..e5f555688 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PackageImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ParameterizedTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ParameterizedTypeImpl.java
index 039fce535..039fce535 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ParameterizedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ParameterizedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ParenthesizedExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ParenthesizedExpressionImpl.java
index 16772fe11..16772fe11 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ParenthesizedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ParenthesizedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PostfixExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PostfixExpressionImpl.java
index 176c91221..176c91221 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PostfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PostfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrefixExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrefixExpressionImpl.java
index 819187e7b..819187e7b 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrefixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrefixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeBooleanImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeBooleanImpl.java
index c246979bd..c246979bd 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeBooleanImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeBooleanImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeByteImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeByteImpl.java
index 49504dbd6..49504dbd6 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeByteImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeByteImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeCharImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeCharImpl.java
index dc3c67617..dc3c67617 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeCharImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeCharImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeDoubleImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeDoubleImpl.java
index 0fd24c96b..0fd24c96b 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeDoubleImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeDoubleImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeFloatImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeFloatImpl.java
index 85242afbb..85242afbb 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeFloatImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeFloatImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeImpl.java
index 1014747e9..1014747e9 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeIntImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeIntImpl.java
index 4c35fdbca..4c35fdbca 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeIntImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeIntImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeLongImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeLongImpl.java
index c3668f4dd..c3668f4dd 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeLongImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeLongImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeShortImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeShortImpl.java
index 2fff9e9a3..2fff9e9a3 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeShortImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeShortImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeVoidImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeVoidImpl.java
index 933363a70..933363a70 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeVoidImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/PrimitiveTypeVoidImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ReturnStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ReturnStatementImpl.java
index d9453c567..d9453c567 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ReturnStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ReturnStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableAccessImpl.java
index 1feda6355..1feda6355 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableDeclarationImpl.java
index 7b4e65446..7b4e65446 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/StatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/StatementImpl.java
index cbf247655..cbf247655 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/StatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/StatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/StringLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/StringLiteralImpl.java
index 3818857ee..3818857ee 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/StringLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/StringLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SuperConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SuperConstructorInvocationImpl.java
index 1dd661a01..1dd661a01 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SuperConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SuperConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SuperFieldAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SuperFieldAccessImpl.java
index 7beae6660..7beae6660 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SuperFieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SuperFieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SuperMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SuperMethodInvocationImpl.java
index 4c84c6bdd..4c84c6bdd 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SuperMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SuperMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SwitchCaseImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SwitchCaseImpl.java
index 746503354..746503354 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SwitchCaseImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SwitchCaseImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SwitchStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SwitchStatementImpl.java
index 8e49e0067..8e49e0067 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SwitchStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SwitchStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SynchronizedStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SynchronizedStatementImpl.java
index cb4ed5316..cb4ed5316 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/SynchronizedStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/SynchronizedStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TagElementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TagElementImpl.java
index 00d43a78d..00d43a78d 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TagElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TagElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TextElementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TextElementImpl.java
index 63458c3be..63458c3be 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TextElementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TextElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ThisExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ThisExpressionImpl.java
index 589d6c0e9..589d6c0e9 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ThisExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ThisExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ThrowStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ThrowStatementImpl.java
index f9fe6eaed..f9fe6eaed 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/ThrowStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/ThrowStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TryStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TryStatementImpl.java
index 73dcdf877..73dcdf877 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TryStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TryStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeAccessImpl.java
index 301475224..301475224 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationImpl.java
index 5623fc85a..5623fc85a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationStatementImpl.java
index 81ae2133d..81ae2133d 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeImpl.java
index db068b2ec..db068b2ec 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeLiteralImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeLiteralImpl.java
index e2f4a8117..e2f4a8117 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeParameterImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeParameterImpl.java
index d484bd4b1..d484bd4b1 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/TypeParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/TypeParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationDeclarationImpl.java
index 53bcc3ec1..53bcc3ec1 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
index b8062c36a..b8062c36a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedClassDeclarationImpl.java
index c75381b03..c75381b03 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedEnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedEnumDeclarationImpl.java
index 3019a710c..3019a710c 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedEnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedEnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedInterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedInterfaceDeclarationImpl.java
index fa46234f3..fa46234f3 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedInterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedInterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemAccessImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemAccessImpl.java
index 491ca5d1a..491ca5d1a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemImpl.java
index d4c08e3ae..d4c08e3ae 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedItemImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedLabeledStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedLabeledStatementImpl.java
index cf962e8a8..cf962e8a8 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedLabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedLabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedMethodDeclarationImpl.java
index 8b30b1893..8b30b1893 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedSingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedSingleVariableDeclarationImpl.java
index 0ee4b7565..0ee4b7565 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedSingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedSingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeDeclarationImpl.java
index 766987166..766987166 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeImpl.java
index 7ce70a8cf..7ce70a8cf 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedVariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedVariableDeclarationFragmentImpl.java
index 20f4e8b7c..20f4e8b7c 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedVariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/UnresolvedVariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationExpressionImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationExpressionImpl.java
index fe9f4a764..fe9f4a764 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationFragmentImpl.java
index 498b9b359..498b9b359 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationImpl.java
index 99ba59bfe..99ba59bfe 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationStatementImpl.java
index 04690d598..04690d598 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/VariableDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/WhileStatementImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/WhileStatementImpl.java
index 92f244bfa..92f244bfa 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/WhileStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/WhileStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/WildCardTypeImpl.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/WildCardTypeImpl.java
index c90844734..c90844734 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/WildCardTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/WildCardTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/java.ecore b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/java.ecore
index f0b0d8c4a..f0b0d8c4a 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/impl/java.ecore
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/impl/java.ecore
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/meta/JavaFactory.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/meta/JavaFactory.java
index 820edf55d..820edf55d 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/meta/JavaFactory.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/meta/JavaFactory.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/meta/JavaPackage.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/meta/JavaPackage.java
index 9694c83bf..9694c83bf 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/meta/JavaPackage.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/meta/JavaPackage.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/util/JavaAdapterFactory.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/util/JavaAdapterFactory.java
index 623f0b1c5..623f0b1c5 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/util/JavaAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/util/JavaAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/util/JavaSwitch.java b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/util/JavaSwitch.java
index a2475ca64..a2475ca64 100644
--- a/org.eclipse.gmt.modisco.java.nousages/src/org/eclipse/gmt/modisco/java/nousages/util/JavaSwitch.java
+++ b/org.eclipse.gmt.modisco.java.nousages/src-gen/org/eclipse/gmt/modisco/java/nousages/util/JavaSwitch.java
diff --git a/org.eclipse.gmt.modisco.java.queries/.checkstyle b/org.eclipse.gmt.modisco.java.queries/.checkstyle
index 1d9ce8d76..334787e7d 100644
--- a/org.eclipse.gmt.modisco.java.queries/.checkstyle
+++ b/org.eclipse.gmt.modisco.java.queries/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
    </fileset>
diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAbstract.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAbstract.java
index b5b6753fb..6b1fdae86 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAbstract.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAbstract.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAccess.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAccess.java
index 2e281391f..c7f140f9c 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAccess.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsAccess.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDefault.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDefault.java
index 43ec1a49f..7a1e52bc4 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDefault.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDefault.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDeprecated.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDeprecated.java
index b7356aede..8b845a45a 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDeprecated.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsDeprecated.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsFinal.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsFinal.java
index ceee83f0e..87f0feb7f 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsFinal.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsFinal.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsGenerated.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsGenerated.java
index 16e33aad0..8dd8245d1 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsGenerated.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsGenerated.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsNative.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsNative.java
index 40f4d7dd7..dcfe61327 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsNative.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsNative.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsOverridden.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsOverridden.java
index 4a9583ba5..ccea5fd17 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsOverridden.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsOverridden.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPrivate.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPrivate.java
index 8c8ab7d29..dd2254c91 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPrivate.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPrivate.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsProtected.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsProtected.java
index 2bf7549a3..7e7da28c7 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsProtected.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsProtected.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPublic.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPublic.java
index 924a38328..e41960b6a 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPublic.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsPublic.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsStatic.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsStatic.java
index ee2dce763..57261b36a 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsStatic.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsStatic.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSuppressWarnings.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSuppressWarnings.java
index 9cc1cdcff..5ecf0b4d5 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSuppressWarnings.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSuppressWarnings.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSynchronized.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSynchronized.java
index fec865537..503fe6cb5 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSynchronized.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsSynchronized.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsTransient.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsTransient.java
index 9e60a4980..595aa1166 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsTransient.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsTransient.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsUnresolved.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsUnresolved.java
index 9995223f8..dd6371d99 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsUnresolved.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsUnresolved.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsVolatile.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsVolatile.java
index 0d19af75c..314549b43 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsVolatile.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/modifiers/IsVolatile.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodDeclarationText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodDeclarationText.java
index 19608314c..dbe896473 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodDeclarationText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodDeclarationText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodInvocationText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodInvocationText.java
index 6b42cd55f..f1812d584 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodInvocationText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetAbstractMethodInvocationText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetConstructorDeclarationText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetConstructorDeclarationText.java
index 6ff4b7448..75e107d84 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetConstructorDeclarationText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetConstructorDeclarationText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetFieldDeclarationText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetFieldDeclarationText.java
index 3c2e6fb24..bde73a7ba 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetFieldDeclarationText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetFieldDeclarationText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodDeclarationText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodDeclarationText.java
index 7ff7dc7e3..687f8afd2 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodDeclarationText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodDeclarationText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software)

@@ -37,7 +37,7 @@ public class GetMethodDeclarationText implements IJavaModelQuery<MethodDeclarati
 				SingleVariableDeclaration var = context.getParameters().get(i);

 				if (var.getType() != null && var.getType().getType() != null) {

 					completeMethodName.append(var.getType().getType().getName())

-							.append(" ").append(var.getName()); //$NON-NLS-1$ 

+							.append(" ").append(var.getName()); //$NON-NLS-1$

 				}

 				if (i != context.getParameters().size() - 1) {

 					completeMethodName.append(", "); //$NON-NLS-1$

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodRefText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodRefText.java
index 8b176e44e..28554c2be 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodRefText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetMethodRefText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetQualifiedName.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetQualifiedName.java
index 3c9b2ed26..b55d67dc2 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetQualifiedName.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetQualifiedName.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetSingleVariableAccessText.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetSingleVariableAccessText.java
index 610881ff2..11390f17a 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetSingleVariableAccessText.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetSingleVariableAccessText.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetTypeRef.java b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetTypeRef.java
index 90f398279..577916a57 100644
--- a/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetTypeRef.java
+++ b/org.eclipse.gmt.modisco.java.queries/src/org/eclipse/gmt/modisco/java/queries/text/GetTypeRef.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.gmt.modisco.java/.checkstyle b/org.eclipse.gmt.modisco.java/.checkstyle
index 844a3885d..50fe5c4d6 100644
--- a/org.eclipse.gmt.modisco.java/.checkstyle
+++ b/org.eclipse.gmt.modisco.java/.checkstyle
@@ -1,16 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/java"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/emf"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/emf/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/emf/util"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/java/internal/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.java/.classpath b/org.eclipse.gmt.modisco.java/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.java/.classpath
+++ b/org.eclipse.gmt.modisco.java/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.java/build.properties b/org.eclipse.gmt.modisco.java/build.properties
index a68690bc4..4f5d69115 100644
--- a/org.eclipse.gmt.modisco.java/build.properties
+++ b/org.eclipse.gmt.modisco.java/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2009 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -12,6 +12,7 @@
 #     Gabriel Barbier (Mia-Software) - initial API and implementation

 #     Erwan Breton (Sodifrance) - initial API and implementation

 #     Romain Dervaux (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -24,6 +25,6 @@ bin.includes = .,\
                about.properties,\

                modeling32.png

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.java/model/java.genmodel b/org.eclipse.gmt.modisco.java/model/java.genmodel
index cffac061f..467afedd0 100644
--- a/org.eclipse.gmt.modisco.java/model/java.genmodel
+++ b/org.eclipse.gmt.modisco.java/model/java.genmodel
@@ -1,7 +1,7 @@
 <?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;    Sebastien Minguet (Mia-Software) - initial API and implementation&#xD;&#xA;    Frederic 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"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009, 2018 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;    Sebastien Minguet (Mia-Software) - initial API and implementation&#xD;&#xA;    Frederic 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;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.java/src-gen" modelPluginID="org.eclipse.gmt.modisco.java"

     modelName="Java" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"

     runtimeVersion="2.6">

diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ASTNode.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ASTNode.java
index e36f1d0f6..e36f1d0f6 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ASTNode.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ASTNode.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
index 64a06df9e..64a06df9e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
index 7d90ce880..7d90ce880 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractMethodInvocation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
index e5852c0b4..e5852c0b4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
index f351dc890..f351dc890 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractTypeQualifiedExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
index 0da03e585..0da03e585 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AbstractVariablesContainer.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Annotation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Annotation.java
index 697f19020..697f19020 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Annotation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Annotation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
index a7f8a44c7..a7f8a44c7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnnotationMemberValuePair.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
index b8db679df..b8db679df 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
index 494120173..494120173 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnnotationTypeMemberDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
index 338048f0f..338048f0f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AnonymousClassDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Archive.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Archive.java
index 844cca28c..844cca28c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Archive.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Archive.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayAccess.java
index 34697f5f5..34697f5f5 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayCreation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayCreation.java
index ee35e58ae..ee35e58ae 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayCreation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayCreation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayInitializer.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayInitializer.java
index dd9d11fa7..dd9d11fa7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayInitializer.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayInitializer.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
index b93dc1b55..b93dc1b55 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayLengthAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayType.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayType.java
index 6fbf6fd9d..6fbf6fd9d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ArrayType.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ArrayType.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AssertStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AssertStatement.java
index f04afbbea..f04afbbea 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AssertStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AssertStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Assignment.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Assignment.java
index 90add9796..90add9796 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Assignment.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Assignment.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AssignmentKind.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AssignmentKind.java
index f0a2154bd..f0a2154bd 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/AssignmentKind.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/AssignmentKind.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Block.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Block.java
index 634e35263..634e35263 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Block.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Block.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BlockComment.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BlockComment.java
index 2c58c8113..2c58c8113 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BlockComment.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BlockComment.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BodyDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BodyDeclaration.java
index cb6e76579..cb6e76579 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BodyDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BodyDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BooleanLiteral.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BooleanLiteral.java
index a9a858ec7..a9a858ec7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BooleanLiteral.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BooleanLiteral.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BreakStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BreakStatement.java
index d1231ec7d..d1231ec7d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/BreakStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/BreakStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CastExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CastExpression.java
index 60085a7c8..60085a7c8 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CastExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CastExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CatchClause.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CatchClause.java
index 7050512d1..7050512d1 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CatchClause.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CatchClause.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CharacterLiteral.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CharacterLiteral.java
index 436808bcb..436808bcb 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CharacterLiteral.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CharacterLiteral.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ClassDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ClassDeclaration.java
index a10fe5bf4..a10fe5bf4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ClassDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ClassDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ClassFile.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ClassFile.java
index f2b1132a3..f2b1132a3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ClassFile.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ClassFile.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
index af49bf590..af49bf590 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ClassInstanceCreation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Comment.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Comment.java
index a94d5ee5e..a94d5ee5e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Comment.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Comment.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CompilationUnit.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CompilationUnit.java
index 2ff10cb8f..2ff10cb8f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/CompilationUnit.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/CompilationUnit.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ConditionalExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ConditionalExpression.java
index d4c4092f0..d4c4092f0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ConditionalExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ConditionalExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
index f9755bff5..f9755bff5 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ConstructorDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
index 18780ee33..18780ee33 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ConstructorInvocation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ContinueStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ContinueStatement.java
index 60cfab7a4..60cfab7a4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ContinueStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ContinueStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/DoStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/DoStatement.java
index 8e9471aea..8e9471aea 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/DoStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/DoStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EmptyStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EmptyStatement.java
index db3667b07..db3667b07 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EmptyStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EmptyStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
index 61d1e18a9..61d1e18a9 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EnhancedForStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
index fb25df10d..fb25df10d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EnumConstantDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EnumDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EnumDeclaration.java
index 994399d8a..994399d8a 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/EnumDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/EnumDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Expression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Expression.java
index 4964322c8..4964322c8 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Expression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Expression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ExpressionStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ExpressionStatement.java
index be7e61a92..be7e61a92 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ExpressionStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ExpressionStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/FieldAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/FieldAccess.java
index bf6a005d4..bf6a005d4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/FieldAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/FieldAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/FieldDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/FieldDeclaration.java
index a2e7bde02..a2e7bde02 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/FieldDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/FieldDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ForStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ForStatement.java
index 8100fd8e8..8100fd8e8 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ForStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ForStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/IJavaConstants.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/IJavaConstants.java
index bf2c57b8f..bf2c57b8f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/IJavaConstants.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/IJavaConstants.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/IfStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/IfStatement.java
index 294c11c10..294c11c10 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/IfStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/IfStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ImportDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ImportDeclaration.java
index 9b62bd6de..9b62bd6de 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ImportDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ImportDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InfixExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InfixExpression.java
index 38a1715c4..38a1715c4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InfixExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InfixExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
index 2c713ac6b..2c713ac6b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InfixExpressionKind.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InheritanceKind.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InheritanceKind.java
index 97eea52d0..97eea52d0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InheritanceKind.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InheritanceKind.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Initializer.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Initializer.java
index 08b90cf8f..08b90cf8f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Initializer.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Initializer.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InstanceofExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InstanceofExpression.java
index b154cf03e..b154cf03e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InstanceofExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InstanceofExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
index af8fb13e0..af8fb13e0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/InterfaceDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Javadoc.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Javadoc.java
index 5b3128b00..5b3128b00 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Javadoc.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Javadoc.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/LabeledStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/LabeledStatement.java
index d1d6dc87c..d1d6dc87c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/LabeledStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/LabeledStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/LineComment.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/LineComment.java
index 03f15bd5f..03f15bd5f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/LineComment.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/LineComment.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Manifest.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Manifest.java
index 6437b87df..6437b87df 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Manifest.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Manifest.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ManifestAttribute.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ManifestAttribute.java
index 8dababea7..8dababea7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ManifestAttribute.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ManifestAttribute.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ManifestEntry.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ManifestEntry.java
index d72bbfa8c..d72bbfa8c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ManifestEntry.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ManifestEntry.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MemberRef.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MemberRef.java
index bd95fd233..bd95fd233 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MemberRef.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MemberRef.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodDeclaration.java
index 41ecdb742..41ecdb742 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodInvocation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodInvocation.java
index 49029f445..49029f445 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodInvocation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodInvocation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodRef.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodRef.java
index 3bc3c6518..3bc3c6518 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodRef.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodRef.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodRefParameter.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodRefParameter.java
index b3d9c232c..b3d9c232c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/MethodRefParameter.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/MethodRefParameter.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Model.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Model.java
index 751c4c2d0..751c4c2d0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Model.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Model.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Modifier.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Modifier.java
index 27600886d..27600886d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Modifier.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Modifier.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NamedElement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NamedElement.java
index 5e7f6779e..5e7f6779e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NamedElement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NamedElement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NamespaceAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NamespaceAccess.java
index 1b7ef2057..1b7ef2057 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NamespaceAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NamespaceAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NullLiteral.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NullLiteral.java
index 27a067cc4..27a067cc4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NullLiteral.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NullLiteral.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NumberLiteral.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NumberLiteral.java
index 4fb78d1e9..4fb78d1e9 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/NumberLiteral.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/NumberLiteral.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Package.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Package.java
index e0d2231d3..e0d2231d3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Package.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Package.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PackageAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PackageAccess.java
index d8ada80c8..d8ada80c8 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PackageAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PackageAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ParameterizedType.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ParameterizedType.java
index d561c88f6..d561c88f6 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ParameterizedType.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ParameterizedType.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
index ae0502f40..ae0502f40 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ParenthesizedExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PostfixExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PostfixExpression.java
index 4f74da173..4f74da173 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PostfixExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PostfixExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
index bf816f099..bf816f099 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PostfixExpressionKind.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrefixExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrefixExpression.java
index 786c3b47c..786c3b47c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrefixExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrefixExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
index 6c294d99c..6c294d99c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrefixExpressionKind.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveType.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveType.java
index 4918315cf..4918315cf 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveType.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveType.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
index f8119927d..f8119927d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeBoolean.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
index 44e412376..44e412376 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeByte.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
index bf468af92..bf468af92 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeChar.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
index fdaac3b69..fdaac3b69 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeDouble.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
index d12664c3a..d12664c3a 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeFloat.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
index 0eac58f76..0eac58f76 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeInt.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
index 35cee3340..35cee3340 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeLong.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
index ccadfc7ce..ccadfc7ce 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeShort.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
index d5a6c8160..d5a6c8160 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/PrimitiveTypeVoid.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ReturnStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ReturnStatement.java
index 678268691..678268691 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ReturnStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ReturnStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
index 2700cad29..2700cad29 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SingleVariableAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
index 0c6bea49f..0c6bea49f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SingleVariableDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Statement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Statement.java
index c44857eff..c44857eff 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Statement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Statement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/StringLiteral.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/StringLiteral.java
index bd20b982c..bd20b982c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/StringLiteral.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/StringLiteral.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
index eb13860d0..eb13860d0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SuperConstructorInvocation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
index 004904e5c..004904e5c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SuperFieldAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
index 8e5b580d0..8e5b580d0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SuperMethodInvocation.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SwitchCase.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SwitchCase.java
index e5b9fdff2..e5b9fdff2 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SwitchCase.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SwitchCase.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SwitchStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SwitchStatement.java
index 4ba6482ea..4ba6482ea 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SwitchStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SwitchStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
index 8f46752b4..8f46752b4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/SynchronizedStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TagElement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TagElement.java
index 82354ddd3..82354ddd3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TagElement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TagElement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TextElement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TextElement.java
index a214edf5f..a214edf5f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TextElement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TextElement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ThisExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ThisExpression.java
index 2fa759b7d..2fa759b7d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ThisExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ThisExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ThrowStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ThrowStatement.java
index fcde4b82d..fcde4b82d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/ThrowStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/ThrowStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TryStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TryStatement.java
index 86f1c7c7c..86f1c7c7c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TryStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TryStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Type.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Type.java
index 6b32fe5c5..6b32fe5c5 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/Type.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/Type.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeAccess.java
index 4f1081ab0..4f1081ab0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeDeclaration.java
index 3194612e6..3194612e6 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
index a50a71871..a50a71871 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeDeclarationStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeLiteral.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeLiteral.java
index 7dac09cf8..7dac09cf8 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeLiteral.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeLiteral.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeParameter.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeParameter.java
index 1c83bf3c6..1c83bf3c6 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/TypeParameter.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/TypeParameter.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
index 09adc1e73..09adc1e73 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
index 1075c2c51..1075c2c51 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedAnnotationTypeMemberDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
index 711b5215a..711b5215a 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedClassDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
index 9e7968f8d..9e7968f8d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedEnumDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
index 9dd7bc807..9dd7bc807 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedInterfaceDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedItem.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItem.java
index ef5142083..ef5142083 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedItem.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItem.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
index 569a00638..569a00638 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedItemAccess.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
index 0d5a1913c..0d5a1913c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedLabeledStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
index 61445bb19..61445bb19 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedMethodDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
index a927b394c..a927b394c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedSingleVariableDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedType.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedType.java
index 0e5375f1f..0e5375f1f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedType.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedType.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
index e516ed9dd..e516ed9dd 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
index 86f3c582d..86f3c582d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/UnresolvedVariableDeclarationFragment.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclaration.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclaration.java
index c795273ac..c795273ac 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclaration.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclaration.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
index 95ec101cd..95ec101cd 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationExpression.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
index 1610bc594..1610bc594 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationFragment.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
index 03f40e566..03f40e566 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VariableDeclarationStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VisibilityKind.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VisibilityKind.java
index 9b9b32ba3..9b9b32ba3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/VisibilityKind.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/VisibilityKind.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/WhileStatement.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/WhileStatement.java
index 1caac04e4..1caac04e4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/WhileStatement.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/WhileStatement.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/WildCardType.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/WildCardType.java
index 2bf31c8dc..2bf31c8dc 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/WildCardType.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/WildCardType.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/JavaFactory.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/JavaFactory.java
index 8bb6f96e1..8bb6f96e1 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/JavaFactory.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/JavaFactory.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/JavaPackage.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/JavaPackage.java
index ccfd9af51..ccfd9af51 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/JavaPackage.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/JavaPackage.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java
index 7cb56a83d..7cb56a83d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ASTNodeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java
index 13b759380..13b759380 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java
index 82dfdce91..82dfdce91 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java
index 472eb1d30..472eb1d30 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java
index e7ba35304..e7ba35304 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractTypeQualifiedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java
index ebd1ec778..ebd1ec778 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AbstractVariablesContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java
index dcdd52ee9..dcdd52ee9 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java
index dfbd8cfcb..dfbd8cfcb 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationMemberValuePairImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java
index 491f7d62d..491f7d62d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java
index 5ae3bc0e2..5ae3bc0e2 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java
index 48e605d7e..48e605d7e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AnonymousClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java
index 35fe1458d..35fe1458d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArchiveImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java
index 770187b82..770187b82 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java
index ec58c2940..ec58c2940 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java
index 0c85cab13..0c85cab13 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayInitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java
index 0a68d9b35..0a68d9b35 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayLengthAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java
index d4338eacd..d4338eacd 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java
index 15ebddbe9..15ebddbe9 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AssertStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java
index e6c3e924d..e6c3e924d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/AssignmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java
index 9e93e8a4e..9e93e8a4e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BlockCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java
index 6c32ceb62..6c32ceb62 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BlockImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java
index 75724c7c1..75724c7c1 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BodyDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java
index a47daaca5..a47daaca5 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BooleanLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java
index 84a776121..84a776121 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/BreakStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java
index 65f43c11d..65f43c11d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CastExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java
index d85857a0e..d85857a0e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CatchClauseImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java
index 83c66d074..83c66d074 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CharacterLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java
index f60667d40..f60667d40 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java
index bdfe88a97..bdfe88a97 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ClassFileImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java
index eb19913a4..eb19913a4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ClassInstanceCreationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java
index ab30ee584..ab30ee584 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java
index e38ee3e2b..e38ee3e2b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java
index 4f779dae2..4f779dae2 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ConditionalExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java
index 91101dbc0..91101dbc0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ConstructorDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java
index 1bc52f6d9..1bc52f6d9 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java
index e229392a1..e229392a1 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ContinueStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java
index cce6c3349..cce6c3349 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/DoStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java
index d4243442b..d4243442b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EmptyStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java
index 1a69bab16..1a69bab16 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EnhancedForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java
index 7a7180f0f..7a7180f0f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EnumConstantDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java
index 3e3c969e3..3e3c969e3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/EnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java
index a45c7861f..a45c7861f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java
index e5a7e94aa..e5a7e94aa 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ExpressionStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java
index 00bac017a..00bac017a 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/FieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java
index b70494d4d..b70494d4d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/FieldDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java
index 08ae7833d..08ae7833d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ForStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java
index c5ad41a8f..c5ad41a8f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/IfStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java
index 22b8cf53e..22b8cf53e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ImportDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java
index 553e524ba..553e524ba 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java
index 86e79e344..86e79e344 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InitializerImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java
index 5ccc7a2b4..5ccc7a2b4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InstanceofExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java
index 8dedab6c7..8dedab6c7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/InterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java
index e183c56bd..e183c56bd 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/JavaFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java
index 4dc2d0b38..4dc2d0b38 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/JavaPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java
index ac376727a..ac376727a 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/JavadocImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java
index 5ca907c66..5ca907c66 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/LabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java
index e1ae6c4f7..e1ae6c4f7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/LineCommentImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java
index 2a079ee9e..2a079ee9e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ManifestAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java
index f0d2973f1..f0d2973f1 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ManifestEntryImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java
index 621c88830..621c88830 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ManifestImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java
index 1bde6240e..1bde6240e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MemberRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java
index 00879b7ba..00879b7ba 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java
index 95e1b5926..95e1b5926 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java
index 3de2b363f..3de2b363f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodRefImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java
index bf03dc31c..bf03dc31c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/MethodRefParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java
index 46d1135e3..46d1135e3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ModelImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java
index f9e3d94b1..f9e3d94b1 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ModifierImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java
index bc82e560f..bc82e560f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NamedElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java
index 8670c153f..8670c153f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NamespaceAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java
index 78fcf351e..78fcf351e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NullLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java
index 8f9991f3c..8f9991f3c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/NumberLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java
index 4b25b8861..4b25b8861 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PackageAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java
index fff891b71..fff891b71 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PackageImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java
index bfdd283b4..bfdd283b4 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ParameterizedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java
index ae133ec71..ae133ec71 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ParenthesizedExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java
index 92fdbbc1f..92fdbbc1f 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PostfixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java
index 9f7d7540c..9f7d7540c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrefixExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java
index 0bbda0784..0bbda0784 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeBooleanImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java
index 8112faa3c..8112faa3c 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeByteImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java
index 25a1c8c98..25a1c8c98 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeCharImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java
index 50becac0b..50becac0b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeDoubleImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java
index e00acf3df..e00acf3df 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeFloatImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java
index a5769947d..a5769947d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java
index fe7df58cc..fe7df58cc 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeIntImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java
index 312c63010..312c63010 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeLongImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java
index eef294684..eef294684 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeShortImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java
index cda51be18..cda51be18 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/PrimitiveTypeVoidImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java
index 1311eb2a3..1311eb2a3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ReturnStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java
index b52dad5f2..b52dad5f2 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java
index 123f6ba3d..123f6ba3d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java
index 980f889d0..980f889d0 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/StatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java
index 92a18cea7..92a18cea7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/StringLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java
index f31acedce..f31acedce 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SuperConstructorInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java
index 50b8c2645..50b8c2645 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SuperFieldAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java
index 16e2db251..16e2db251 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SuperMethodInvocationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java
index d300bd37b..d300bd37b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SwitchCaseImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java
index 361cfe27b..361cfe27b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SwitchStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java
index c51cc8e16..c51cc8e16 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/SynchronizedStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java
index e4fba7143..e4fba7143 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TagElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java
index 47eb06f60..47eb06f60 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TextElementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java
index 7a33a2071..7a33a2071 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ThisExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java
index 20521a584..20521a584 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/ThrowStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java
index f65477864..f65477864 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TryStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java
index 50804d270..50804d270 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java
index 3ce804313..3ce804313 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java
index 58f112b9d..58f112b9d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java
index dd5107511..dd5107511 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java
index f02d3af28..f02d3af28 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeLiteralImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java
index da261d4b3..da261d4b3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/TypeParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java
index 6c0c54d95..6c0c54d95 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
index 8ba67088d..8ba67088d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedAnnotationTypeMemberDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java
index 4d3685473..4d3685473 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedClassDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java
index 2f59a8a97..2f59a8a97 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedEnumDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java
index 2b65bc12d..2b65bc12d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedInterfaceDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java
index 7922708e7..7922708e7 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemAccessImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java
index 32323a1eb..32323a1eb 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedItemImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java
index f0e00ddc9..f0e00ddc9 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedLabeledStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java
index 32405eb16..32405eb16 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedMethodDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java
index 032f3c4fd..032f3c4fd 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedSingleVariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java
index 9cc33e5ab..9cc33e5ab 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java
index 06b1aa1ca..06b1aa1ca 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java
index 5530e327d..5530e327d 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/UnresolvedVariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java
index 2728ca37b..2728ca37b 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationExpressionImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java
index 62216251e..62216251e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationFragmentImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java
index 085fa2641..085fa2641 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java
index 9179a1836..9179a1836 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/VariableDeclarationStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java
index 0e1103a26..0e1103a26 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/WhileStatementImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java
index bd026b7c8..bd026b7c8 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/WildCardTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/java.ecore b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/java.ecore
index f5efbc6c3..f5efbc6c3 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/impl/java.ecore
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/impl/java.ecore
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java
index 9e7904305..9e7904305 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/util/JavaAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java
index 8c39f6f19..8c39f6f19 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/emf/util/JavaSwitch.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/internal/util/JavaUtil.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/internal/util/JavaUtil.java
index 91b48b03e..91b48b03e 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/internal/util/JavaUtil.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/internal/util/JavaUtil.java
diff --git a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java
index 616832185..616832185 100644
--- a/org.eclipse.gmt.modisco.java/src/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java
+++ b/org.eclipse.gmt.modisco.java/src-gen/org/eclipse/gmt/modisco/java/plugin/JavaPlugin.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/.checkstyle b/org.eclipse.gmt.modisco.omg.kdm.edit/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/.classpath b/org.eclipse.gmt.modisco.omg.kdm.edit/.classpath
index e2dfb633f..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/.classpath
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/.classpath
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!--

- Copyright (c) 2015 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:

-    Grégoire Dupé (Mia-Software) - Bug 475179 - [Deprecated] org.eclipse.gmt.modisco.kdm.browser.extension

--->

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/build.properties b/org.eclipse.gmt.modisco.omg.kdm.edit/build.properties
index ce8e9b9cc..47d6fc640 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/build.properties
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/build.properties
@@ -7,6 +7,7 @@
 # Contributors:

 #     Nikolai Mansourov (Hatha Systems) - initial API and implementation

 #     Gabriel Barbier (Mia-Software) - minor evolutions for version 1.1

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 bin.includes = .,\

                icons/,\

                META-INF/,\

@@ -14,6 +15,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/AbstractActionRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/AbstractActionRelationshipItemProvider.java
index f768890c5..f768890c5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/AbstractActionRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/AbstractActionRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionElementItemProvider.java
index cf94ebcd3..cf94ebcd3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionItemProviderAdapterFactory.java
index 954c6c160..954c6c160 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionRelationshipItemProvider.java
index 08267dcbe..08267dcbe 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ActionRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/AddressesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/AddressesItemProvider.java
index 8adcc0485..8adcc0485 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/AddressesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/AddressesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/BlockUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/BlockUnitItemProvider.java
index c33c9e68e..c33c9e68e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/BlockUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/BlockUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CallsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CallsItemProvider.java
index 61f95b3db..61f95b3db 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CallsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CallsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CatchUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CatchUnitItemProvider.java
index b355a272c..b355a272c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CatchUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CatchUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CompliesToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CompliesToItemProvider.java
index f48f42018..f48f42018 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CompliesToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CompliesToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ControlFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ControlFlowItemProvider.java
index 3dfc4a85b..3dfc4a85b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ControlFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ControlFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CreatesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CreatesItemProvider.java
index 1453e20ed..1453e20ed 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/CreatesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/CreatesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/DispatchesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/DispatchesItemProvider.java
index 261fb5302..261fb5302 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/DispatchesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/DispatchesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/EntryFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/EntryFlowItemProvider.java
index c8952bb59..c8952bb59 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/EntryFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/EntryFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionFlowItemProvider.java
index 31ee824e1..31ee824e1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionUnitItemProvider.java
index ed867248c..ed867248c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExceptionUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExitFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExitFlowItemProvider.java
index 6e7a5410b..6e7a5410b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExitFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ExitFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/FalseFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/FalseFlowItemProvider.java
index 7a94cac22..7a94cac22 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/FalseFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/FalseFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/FinallyUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/FinallyUnitItemProvider.java
index 49b23eb7a..49b23eb7a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/FinallyUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/FinallyUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/FlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/FlowItemProvider.java
index dea5c1a57..dea5c1a57 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/FlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/FlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/GuardedFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/GuardedFlowItemProvider.java
index 60b7f5650..60b7f5650 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/GuardedFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/GuardedFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ReadsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ReadsItemProvider.java
index dba9e626f..dba9e626f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ReadsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ReadsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ThrowsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ThrowsItemProvider.java
index c392bbad2..c392bbad2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/ThrowsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/ThrowsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/TrueFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/TrueFlowItemProvider.java
index d0363aa0f..d0363aa0f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/TrueFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/TrueFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/TryUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/TryUnitItemProvider.java
index 3aa1b5642..3aa1b5642 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/TryUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/TryUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/UsesTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/UsesTypeItemProvider.java
index 50fca03af..50fca03af 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/UsesTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/UsesTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/WritesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/WritesItemProvider.java
index 34d0d378a..34d0d378a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/action/provider/WritesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/provider/WritesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildComponentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildComponentItemProvider.java
index fa1e2c613..fa1e2c613 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildComponentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildComponentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildDescriptionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildDescriptionItemProvider.java
index af6e406dc..af6e406dc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildDescriptionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildDescriptionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildElementItemProvider.java
index 29889f835..29889f835 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildItemProviderAdapterFactory.java
index 0e6c5ffc5..0e6c5ffc5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildModelItemProvider.java
index b443294bb..b443294bb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildProductItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildProductItemProvider.java
index 6ccf23c5e..6ccf23c5e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildProductItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildProductItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildRelationshipItemProvider.java
index 996fe588c..996fe588c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildResourceItemProvider.java
index 0c1669cad..0c1669cad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildStepItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildStepItemProvider.java
index 230d1a153..230d1a153 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildStepItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/BuildStepItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/ConsumesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/ConsumesItemProvider.java
index 50c41330f..50c41330f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/ConsumesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/ConsumesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/DescribedByItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/DescribedByItemProvider.java
index 9a10a40db..9a10a40db 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/DescribedByItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/DescribedByItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/LibraryItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/LibraryItemProvider.java
index 1a04a740a..1a04a740a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/LibraryItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/LibraryItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/LinksToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/LinksToItemProvider.java
index 8e5c977ad..8e5c977ad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/LinksToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/LinksToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/ProducesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/ProducesItemProvider.java
index 1ae018647..1ae018647 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/ProducesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/ProducesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SuppliedByItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SuppliedByItemProvider.java
index 3eb6e9651..3eb6e9651 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SuppliedByItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SuppliedByItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupplierItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupplierItemProvider.java
index ef8a1b860..ef8a1b860 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupplierItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupplierItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupportedByItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupportedByItemProvider.java
index b40f40d51..b40f40d51 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupportedByItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SupportedByItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SymbolicLinkItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SymbolicLinkItemProvider.java
index d1bebc8d4..d1bebc8d4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/SymbolicLinkItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/SymbolicLinkItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/ToolItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/ToolItemProvider.java
index a62c8c070..a62c8c070 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/build/provider/ToolItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/provider/ToolItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeElementItemProvider.java
index 6173c02af..6173c02af 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeRelationshipItemProvider.java
index 788999f82..788999f82 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/AbstractCodeRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ArrayTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ArrayTypeItemProvider.java
index c376df53b..c376df53b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ArrayTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ArrayTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BagTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BagTypeItemProvider.java
index b77361f43..b77361f43 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BagTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BagTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitTypeItemProvider.java
index 2581452ba..2581452ba 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitstringTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitstringTypeItemProvider.java
index 4105b1a9b..4105b1a9b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitstringTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BitstringTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BooleanTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BooleanTypeItemProvider.java
index 4af68cd1b..4af68cd1b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/BooleanTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/BooleanTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CallableUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CallableUnitItemProvider.java
index 269ea7a02..269ea7a02 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CallableUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CallableUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CharTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CharTypeItemProvider.java
index 5beba138a..5beba138a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CharTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CharTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ChoiceTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ChoiceTypeItemProvider.java
index 5d40111c3..5d40111c3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ChoiceTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ChoiceTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ClassUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ClassUnitItemProvider.java
index c9c8b5fba..c9c8b5fba 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ClassUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ClassUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeAssemblyItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeAssemblyItemProvider.java
index edf5fac52..edf5fac52 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeAssemblyItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeAssemblyItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeElementItemProvider.java
index b0dda56a0..b0dda56a0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemItemProvider.java
index 06facea73..06facea73 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemProviderAdapterFactory.java
index ee2367e72..ee2367e72 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeModelItemProvider.java
index 0ab454da7..0ab454da7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeRelationshipItemProvider.java
index 6e8f600d2..6e8f600d2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CodeRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CommentUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CommentUnitItemProvider.java
index a561404d9..a561404d9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CommentUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CommentUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompilationUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompilationUnitItemProvider.java
index b70e3842c..b70e3842c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompilationUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompilationUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompositeTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompositeTypeItemProvider.java
index a619508f9..a619508f9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompositeTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/CompositeTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ComputationalObjectItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ComputationalObjectItemProvider.java
index f0e21583f..f0e21583f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ComputationalObjectItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ComputationalObjectItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ConditionalDirectiveItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ConditionalDirectiveItemProvider.java
index 8d25f5fd1..8d25f5fd1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ConditionalDirectiveItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ConditionalDirectiveItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ControlElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ControlElementItemProvider.java
index 41806dee3..41806dee3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ControlElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ControlElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DataElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DataElementItemProvider.java
index a494cbd8f..a494cbd8f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DataElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DataElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DatatypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DatatypeItemProvider.java
index f13d9142e..f13d9142e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DatatypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DatatypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DateTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DateTypeItemProvider.java
index b79cfa246..b79cfa246 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DateTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DateTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DecimalTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DecimalTypeItemProvider.java
index b669efcb6..b669efcb6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DecimalTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DecimalTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DefinedTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DefinedTypeItemProvider.java
index 745d8689d..745d8689d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DefinedTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DefinedTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DerivedTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DerivedTypeItemProvider.java
index 74b634cb4..74b634cb4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/DerivedTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/DerivedTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/EnumeratedTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/EnumeratedTypeItemProvider.java
index 632a4c0ea..632a4c0ea 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/EnumeratedTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/EnumeratedTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExpandsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExpandsItemProvider.java
index 2f9adc664..2f9adc664 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExpandsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExpandsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExtendsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExtendsItemProvider.java
index 07b3d8784..07b3d8784 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExtendsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ExtendsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/FloatTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/FloatTypeItemProvider.java
index 95d3d64bc..95d3d64bc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/FloatTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/FloatTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/GeneratedFromItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/GeneratedFromItemProvider.java
index 9d4cb9b06..9d4cb9b06 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/GeneratedFromItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/GeneratedFromItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasTypeItemProvider.java
index 366b85529..366b85529 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasValueItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasValueItemProvider.java
index bdcc9cb08..bdcc9cb08 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasValueItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/HasValueItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementationOfItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementationOfItemProvider.java
index 3cba8cf2b..3cba8cf2b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementationOfItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementationOfItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementsItemProvider.java
index aeb8283a6..aeb8283a6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImplementsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImportsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImportsItemProvider.java
index 1296d0163..1296d0163 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImportsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ImportsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludeDirectiveItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludeDirectiveItemProvider.java
index 80686125a..80686125a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludeDirectiveItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludeDirectiveItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludesItemProvider.java
index b1382e60c..b1382e60c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IncludesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IndexUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IndexUnitItemProvider.java
index c949cb2c8..c949cb2c8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IndexUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IndexUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/InstanceOfItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/InstanceOfItemProvider.java
index b7dc7e0ca..b7dc7e0ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/InstanceOfItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/InstanceOfItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IntegerTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IntegerTypeItemProvider.java
index eac9b7388..eac9b7388 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/IntegerTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/IntegerTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/InterfaceUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/InterfaceUnitItemProvider.java
index 0c613e1af..0c613e1af 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/InterfaceUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/InterfaceUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ItemUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ItemUnitItemProvider.java
index da5451e9e..da5451e9e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ItemUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ItemUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/LanguageUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/LanguageUnitItemProvider.java
index 7cbe1e910..7cbe1e910 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/LanguageUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/LanguageUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroDirectiveItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroDirectiveItemProvider.java
index b5bbffb72..b5bbffb72 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroDirectiveItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroDirectiveItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroUnitItemProvider.java
index c4686be27..c4686be27 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MacroUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MemberUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MemberUnitItemProvider.java
index d6f505184..d6f505184 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MemberUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MemberUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MethodUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MethodUnitItemProvider.java
index c99e5fd7a..c99e5fd7a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/MethodUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/MethodUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ModuleItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ModuleItemProvider.java
index 70f64762d..70f64762d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ModuleItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ModuleItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/NamespaceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/NamespaceItemProvider.java
index 49856be15..49856be15 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/NamespaceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/NamespaceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetTypeItemProvider.java
index b32a4677b..b32a4677b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetstringTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetstringTypeItemProvider.java
index 015cfbcd3..015cfbcd3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetstringTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/OctetstringTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/OrdinalTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/OrdinalTypeItemProvider.java
index 2eb361eb4..2eb361eb4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/OrdinalTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/OrdinalTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PackageItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PackageItemProvider.java
index 6a5a3fe0f..6a5a3fe0f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PackageItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PackageItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterToItemProvider.java
index 2b8696204..2b8696204 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterUnitItemProvider.java
index be1e35735..be1e35735 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ParameterUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PointerTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PointerTypeItemProvider.java
index 4d3547e3a..4d3547e3a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PointerTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PointerTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PreprocessorDirectiveItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PreprocessorDirectiveItemProvider.java
index 8840914cb..8840914cb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PreprocessorDirectiveItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PreprocessorDirectiveItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PrimitiveTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PrimitiveTypeItemProvider.java
index 02c3cc1ec..02c3cc1ec 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/PrimitiveTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/PrimitiveTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/RangeTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/RangeTypeItemProvider.java
index 8cf1b6a29..8cf1b6a29 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/RangeTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/RangeTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/RecordTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/RecordTypeItemProvider.java
index a6c470e4a..a6c470e4a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/RecordTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/RecordTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/RedefinesItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/RedefinesItemProvider.java
index b708b1dbe..b708b1dbe 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/RedefinesItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/RedefinesItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ScaledTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ScaledTypeItemProvider.java
index f35bb8260..f35bb8260 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ScaledTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ScaledTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SequenceTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SequenceTypeItemProvider.java
index 524f8f529..524f8f529 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SequenceTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SequenceTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SetTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SetTypeItemProvider.java
index e90862117..e90862117 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SetTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SetTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SharedUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SharedUnitItemProvider.java
index 3d28a26e0..3d28a26e0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SharedUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SharedUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SignatureItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SignatureItemProvider.java
index d259b214a..d259b214a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SignatureItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SignatureItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/StorableUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/StorableUnitItemProvider.java
index 9317e4421..9317e4421 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/StorableUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/StorableUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/StringTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/StringTypeItemProvider.java
index e94fa9a0c..e94fa9a0c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/StringTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/StringTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SynonymUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SynonymUnitItemProvider.java
index fe22522b0..fe22522b0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/SynonymUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/SynonymUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateParameterItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateParameterItemProvider.java
index 550f956e6..550f956e6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateParameterItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateParameterItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateTypeItemProvider.java
index 0efdecb61..0efdecb61 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateUnitItemProvider.java
index f91a11b0a..f91a11b0a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TemplateUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TimeTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TimeTypeItemProvider.java
index fec374312..fec374312 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TimeTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TimeTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TypeUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TypeUnitItemProvider.java
index 07766e482..07766e482 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/TypeUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/TypeUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueElementItemProvider.java
index 2cc6c8964..2cc6c8964 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueItemProvider.java
index 4b2fadfad..4b2fadfad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueListItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueListItemProvider.java
index ee6278c93..ee6278c93 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueListItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/ValueListItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/VariantToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/VariantToItemProvider.java
index 36c41c90f..36c41c90f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/VariantToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/VariantToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/VisibleInItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/VisibleInItemProvider.java
index 759560c93..759560c93 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/VisibleInItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/VisibleInItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/VoidTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/VoidTypeItemProvider.java
index 56e81a40f..56e81a40f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/code/provider/VoidTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/provider/VoidTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/BehaviorUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/BehaviorUnitItemProvider.java
index 38c07e454..38c07e454 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/BehaviorUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/BehaviorUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualContainerItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualContainerItemProvider.java
index ff34a89ca..ff34a89ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualContainerItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualContainerItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualElementItemProvider.java
index 875bc876e..875bc876e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualFlowItemProvider.java
index 2b4b6e19c..2b4b6e19c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualItemProviderAdapterFactory.java
index a7537233b..a7537233b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualModelItemProvider.java
index fa9ec16b9..fa9ec16b9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRelationshipItemProvider.java
index 5215c02ad..5215c02ad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRoleItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRoleItemProvider.java
index 0ec75f53c..0ec75f53c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRoleItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ConceptualRoleItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/FactUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/FactUnitItemProvider.java
index 33d103ba2..33d103ba2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/FactUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/FactUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/RuleUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/RuleUnitItemProvider.java
index dd6f86e44..dd6f86e44 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/RuleUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/RuleUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ScenarioUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ScenarioUnitItemProvider.java
index 245f04577..245f04577 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ScenarioUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/ScenarioUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/TermUnitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/TermUnitItemProvider.java
index 4c21acd58..4c21acd58 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/TermUnitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/provider/TermUnitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/AggregatedRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/AggregatedRelationshipItemProvider.java
index 6c3eca04e..6c3eca04e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/AggregatedRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/AggregatedRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/CoreItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/CoreItemProviderAdapterFactory.java
index e222ae07e..e222ae07e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/CoreItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/CoreItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/ElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/ElementItemProvider.java
index b224fa0f6..b224fa0f6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/ElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/ElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMEntityItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMEntityItemProvider.java
index 97822d105..97822d105 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMEntityItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMEntityItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMRelationshipItemProvider.java
index 1692421d5..1692421d5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/KDMRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/KdmEditPlugin.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/KdmEditPlugin.java
index 0eff5e22d..0eff5e22d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/KdmEditPlugin.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/KdmEditPlugin.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/ModelElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/ModelElementItemProvider.java
index 37e405a10..37e405a10 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/core/provider/ModelElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/provider/ModelElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/AllContentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/AllContentItemProvider.java
index c243acef2..c243acef2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/AllContentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/AllContentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/CatalogItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/CatalogItemProvider.java
index 228de9065..228de9065 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/CatalogItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/CatalogItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ChoiceContentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ChoiceContentItemProvider.java
index 4f39fd46b..4f39fd46b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ChoiceContentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ChoiceContentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ColumnSetItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ColumnSetItemProvider.java
index 7d0d1b062..7d0d1b062 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ColumnSetItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ColumnSetItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ComplexContentTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ComplexContentTypeItemProvider.java
index 5a1cd1e51..5a1cd1e51 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ComplexContentTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ComplexContentTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentAttributeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentAttributeItemProvider.java
index b326bb153..b326bb153 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentAttributeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentAttributeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentElementItemProvider.java
index e14e47de9..e14e47de9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentItemItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentItemItemProvider.java
index 6552b074c..6552b074c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentItemItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentItemItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentReferenceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentReferenceItemProvider.java
index 722ad44f1..722ad44f1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentReferenceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentReferenceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentRestrictionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentRestrictionItemProvider.java
index be7a87e26..be7a87e26 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentRestrictionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ContentRestrictionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataActionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataActionItemProvider.java
index c5a9bf946..c5a9bf946 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataActionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataActionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataContainerItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataContainerItemProvider.java
index 314f68e7d..314f68e7d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataContainerItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataContainerItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataEventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataEventItemProvider.java
index 746423a5c..746423a5c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataEventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataEventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataItemProviderAdapterFactory.java
index f8cabd3ad..f8cabd3ad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataModelItemProvider.java
index be3007c7d..be3007c7d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataRelationshipItemProvider.java
index d6e0cdf20..d6e0cdf20 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataResourceItemProvider.java
index b4c29d392..b4c29d392 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataSegmentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataSegmentItemProvider.java
index 32aee7d3f..32aee7d3f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataSegmentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DataSegmentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DatatypeOfItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DatatypeOfItemProvider.java
index a9e461c1a..a9e461c1a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/DatatypeOfItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/DatatypeOfItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtendedDataElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtendedDataElementItemProvider.java
index f51ccbba0..f51ccbba0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtendedDataElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtendedDataElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtensionToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtensionToItemProvider.java
index a9792a1ef..a9792a1ef 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtensionToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ExtensionToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/GroupContentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/GroupContentItemProvider.java
index d5ee51013..d5ee51013 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/GroupContentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/GroupContentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/HasContentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/HasContentItemProvider.java
index 3f4190fc0..3f4190fc0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/HasContentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/HasContentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexElementItemProvider.java
index 9f6094edf..9f6094edf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexItemProvider.java
index 1d1aa04a9..1d1aa04a9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/IndexItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/KeyRelationItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/KeyRelationItemProvider.java
index d6d1dc82b..d6d1dc82b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/KeyRelationItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/KeyRelationItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ManagesDataItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ManagesDataItemProvider.java
index b0fc2f18a..b0fc2f18a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ManagesDataItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ManagesDataItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/MixedContentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/MixedContentItemProvider.java
index ef10ff3c6..ef10ff3c6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/MixedContentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/MixedContentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ProducesDataEventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ProducesDataEventItemProvider.java
index 6f1853231..6f1853231 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ProducesDataEventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ProducesDataEventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReadsColumnSetItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReadsColumnSetItemProvider.java
index 340b03590..340b03590 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReadsColumnSetItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReadsColumnSetItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RecordFileItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RecordFileItemProvider.java
index c0bff7bf5..c0bff7bf5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RecordFileItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RecordFileItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceKeyItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceKeyItemProvider.java
index 3886dbcf2..3886dbcf2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceKeyItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceKeyItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceToItemProvider.java
index 08f1c4aa1..08f1c4aa1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/ReferenceToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalSchemaItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalSchemaItemProvider.java
index 376dd28e6..376dd28e6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalSchemaItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalSchemaItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalTableItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalTableItemProvider.java
index 58f901642..58f901642 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalTableItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalTableItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalViewItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalViewItemProvider.java
index 7de0162ef..7de0162ef 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalViewItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RelationalViewItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RestrictionOfItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RestrictionOfItemProvider.java
index d56a06fc5..d56a06fc5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/RestrictionOfItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/RestrictionOfItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/SeqContentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/SeqContentItemProvider.java
index 4acb02824..4acb02824 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/SeqContentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/SeqContentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/SimpleContentTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/SimpleContentTypeItemProvider.java
index a50ce4fd9..a50ce4fd9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/SimpleContentTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/SimpleContentTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/TypedByItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/TypedByItemProvider.java
index 8a5c91077..8a5c91077 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/TypedByItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/TypedByItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/UniqueKeyItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/UniqueKeyItemProvider.java
index daea94036..daea94036 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/UniqueKeyItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/UniqueKeyItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/WritesColumnSetItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/WritesColumnSetItemProvider.java
index 96a0239c7..96a0239c7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/WritesColumnSetItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/WritesColumnSetItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/XMLSchemaItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/XMLSchemaItemProvider.java
index c820d2c3f..c820d2c3f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/data/provider/XMLSchemaItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/provider/XMLSchemaItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/ConsumesEventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/ConsumesEventItemProvider.java
index df3ddc7eb..df3ddc7eb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/ConsumesEventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/ConsumesEventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventActionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventActionItemProvider.java
index f281ac5b7..f281ac5b7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventActionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventActionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventElementItemProvider.java
index a39ea9939..a39ea9939 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProvider.java
index d9de7b760..d9de7b760 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProviderAdapterFactory.java
index 864ff1441..864ff1441 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventModelItemProvider.java
index 0d70445b5..0d70445b5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventRelationshipItemProvider.java
index 9fb7497dc..9fb7497dc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventResourceItemProvider.java
index fbb311f72..fbb311f72 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/EventResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/HasStateItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/HasStateItemProvider.java
index c1650cfe4..c1650cfe4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/HasStateItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/HasStateItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/InitialStateItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/InitialStateItemProvider.java
index b41365b78..b41365b78 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/InitialStateItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/InitialStateItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/NextStateItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/NextStateItemProvider.java
index 6ff8b797e..6ff8b797e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/NextStateItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/NextStateItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnEntryItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnEntryItemProvider.java
index a2f4b9b14..a2f4b9b14 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnEntryItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnEntryItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnExitItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnExitItemProvider.java
index a694edfc2..a694edfc2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnExitItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/OnExitItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/ProducesEventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/ProducesEventItemProvider.java
index aa26518d4..aa26518d4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/ProducesEventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/ProducesEventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/ReadsStateItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/ReadsStateItemProvider.java
index fa05369ab..fa05369ab 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/ReadsStateItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/ReadsStateItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/StateItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/StateItemProvider.java
index 9a6b1e98a..9a6b1e98a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/StateItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/StateItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/TransitionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/TransitionItemProvider.java
index 62f59255a..62f59255a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/event/provider/TransitionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/provider/TransitionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AnnotationItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AnnotationItemProvider.java
index 46e0fdd06..46e0fdd06 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AnnotationItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AnnotationItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AttributeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AttributeItemProvider.java
index 596ec6dc9..596ec6dc9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AttributeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AttributeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AuditItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AuditItemProvider.java
index 32fc6ab6b..32fc6ab6b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AuditItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/AuditItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtendedValueItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtendedValueItemProvider.java
index c04633b95..c04633b95 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtendedValueItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtendedValueItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtensionFamilyItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtensionFamilyItemProvider.java
index bb05097a1..bb05097a1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtensionFamilyItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/ExtensionFamilyItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMFrameworkItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMFrameworkItemProvider.java
index f9c7e80b3..f9c7e80b3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMFrameworkItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMFrameworkItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMModelItemProvider.java
index 28d8eee80..28d8eee80 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KDMModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KdmItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KdmItemProviderAdapterFactory.java
index 714893cce..714893cce 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KdmItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/KdmItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/SegmentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/SegmentItemProvider.java
index 468d9ff7f..468d9ff7f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/SegmentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/SegmentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/StereotypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/StereotypeItemProvider.java
index 436595b97..436595b97 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/StereotypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/StereotypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TagDefinitionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TagDefinitionItemProvider.java
index 095174161..095174161 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TagDefinitionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TagDefinitionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedRefItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedRefItemProvider.java
index 0ad3188d8..0ad3188d8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedRefItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedRefItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedValueItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedValueItemProvider.java
index 924743a81..924743a81 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedValueItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/provider/TaggedValueItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformElementItemProvider.java
index 636fa3d05..636fa3d05 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformRelationshipItemProvider.java
index 62ccb60c3..62ccb60c3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/AbstractPlatformRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/BindsToItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/BindsToItemProvider.java
index 91d6d7fb9..91d6d7fb9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/BindsToItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/BindsToItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DataManagerItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DataManagerItemProvider.java
index 860afd1cb..860afd1cb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DataManagerItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DataManagerItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DefinedByItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DefinedByItemProvider.java
index 15aa21d4e..15aa21d4e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DefinedByItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DefinedByItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedComponentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedComponentItemProvider.java
index ac2dc4254..ac2dc4254 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedComponentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedComponentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedResourceItemProvider.java
index 7507e0e6f..7507e0e6f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedSoftwareSystemItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedSoftwareSystemItemProvider.java
index 907993e87..907993e87 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedSoftwareSystemItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/DeployedSoftwareSystemItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExecutionResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExecutionResourceItemProvider.java
index fdadce49f..fdadce49f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExecutionResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExecutionResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExternalActorItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExternalActorItemProvider.java
index 8ba4d76c0..8ba4d76c0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExternalActorItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ExternalActorItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/FileResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/FileResourceItemProvider.java
index 65c7727f9..65c7727f9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/FileResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/FileResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LoadsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LoadsItemProvider.java
index 9e5180a87..9e5180a87 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LoadsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LoadsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LockResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LockResourceItemProvider.java
index cd0932724..cd0932724 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LockResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/LockResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MachineItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MachineItemProvider.java
index 9b1789256..9b1789256 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MachineItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MachineItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ManagesResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ManagesResourceItemProvider.java
index 3dec74b3e..3dec74b3e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ManagesResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ManagesResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MarshalledResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MarshalledResourceItemProvider.java
index ab53d8b63..ab53d8b63 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MarshalledResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MarshalledResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MessagingResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MessagingResourceItemProvider.java
index d08e05c1f..d08e05c1f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MessagingResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/MessagingResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/NamingResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/NamingResourceItemProvider.java
index e101865a9..e101865a9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/NamingResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/NamingResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformActionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformActionItemProvider.java
index 1bdf3383a..1bdf3383a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformActionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformActionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformElementItemProvider.java
index 7d9e3b785..7d9e3b785 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformEventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformEventItemProvider.java
index a66a059ca..a66a059ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformEventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformEventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformItemProviderAdapterFactory.java
index 5c79c0328..5c79c0328 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformModelItemProvider.java
index c998e6a05..c998e6a05 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformRelationshipItemProvider.java
index 4a6e691ab..4a6e691ab 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/PlatformRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ProcessItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ProcessItemProvider.java
index b5b082e6e..b5b082e6e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ProcessItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ProcessItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ReadsResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ReadsResourceItemProvider.java
index 5c411d9d5..5c411d9d5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ReadsResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ReadsResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RequiresItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RequiresItemProvider.java
index efc732ff1..efc732ff1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RequiresItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RequiresItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ResourceTypeItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ResourceTypeItemProvider.java
index 448f609d5..448f609d5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ResourceTypeItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ResourceTypeItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RuntimeResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RuntimeResourceItemProvider.java
index 455f33328..455f33328 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RuntimeResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/RuntimeResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/SpawnsItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/SpawnsItemProvider.java
index 04ad399a8..04ad399a8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/SpawnsItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/SpawnsItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/StreamResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/StreamResourceItemProvider.java
index 56e911d47..56e911d47 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/StreamResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/StreamResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ThreadItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ThreadItemProvider.java
index b4dc78536..b4dc78536 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ThreadItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/ThreadItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/WritesResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/WritesResourceItemProvider.java
index 3ea18429d..3ea18429d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/platform/provider/WritesResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/provider/WritesResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryElementItemProvider.java
index c0b5e9a2a..c0b5e9a2a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryRelationshipItemProvider.java
index 2e0fa57cf..2e0fa57cf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/AbstractInventoryRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/BinaryFileItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/BinaryFileItemProvider.java
index 6e9693e94..6e9693e94 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/BinaryFileItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/BinaryFileItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ConfigurationItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ConfigurationItemProvider.java
index 2f6490edb..2f6490edb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ConfigurationItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ConfigurationItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/DependsOnItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/DependsOnItemProvider.java
index bc520fc50..bc520fc50 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/DependsOnItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/DependsOnItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/DirectoryItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/DirectoryItemProvider.java
index 921bddc2d..921bddc2d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/DirectoryItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/DirectoryItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ExecutableFileItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ExecutableFileItemProvider.java
index 10f5261e9..10f5261e9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ExecutableFileItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ExecutableFileItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ImageItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ImageItemProvider.java
index 31fe8c63f..31fe8c63f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ImageItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ImageItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryContainerItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryContainerItemProvider.java
index 851b1b8f2..851b1b8f2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryContainerItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryContainerItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryElementItemProvider.java
index 944d9b391..944d9b391 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryItemItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryItemItemProvider.java
index 8577021b0..8577021b0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryItemItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryItemItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryModelItemProvider.java
index ac4aff368..ac4aff368 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryRelationshipItemProvider.java
index e1aaa505f..e1aaa505f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/InventoryRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ProjectItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ProjectItemProvider.java
index 62e69e9ee..62e69e9ee 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ProjectItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ProjectItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ResourceDescriptionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ResourceDescriptionItemProvider.java
index f0e56d556..f0e56d556 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/ResourceDescriptionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/ResourceDescriptionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceFileItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceFileItemProvider.java
index 193e8bc8f..193e8bc8f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceFileItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceFileItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceItemProviderAdapterFactory.java
index c93f14f3c..c93f14f3c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRefItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRefItemProvider.java
index 7cf3decb3..7cf3decb3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRefItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRefItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRegionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRegionItemProvider.java
index 04fbc45bc..04fbc45bc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRegionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/provider/SourceRegionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ArchitectureViewItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ArchitectureViewItemProvider.java
index 25793ecb8..25793ecb8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ArchitectureViewItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ArchitectureViewItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ComponentItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ComponentItemProvider.java
index 0124a9b7a..0124a9b7a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ComponentItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/ComponentItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/LayerItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/LayerItemProvider.java
index 7e82d2190..7e82d2190 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/LayerItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/LayerItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SoftwareSystemItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SoftwareSystemItemProvider.java
index 2c9b5963a..2c9b5963a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SoftwareSystemItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SoftwareSystemItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureElementItemProvider.java
index 1e6b4a374..1e6b4a374 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureItemProviderAdapterFactory.java
index fee4c3801..fee4c3801 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureModelItemProvider.java
index 3500559f3..3500559f3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureRelationshipItemProvider.java
index b256fa51f..b256fa51f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/StructureRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SubsystemItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SubsystemItemProvider.java
index 166ec0e25..166ec0e25 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SubsystemItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/provider/SubsystemItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysImageItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysImageItemProvider.java
index 4d68821d3..4d68821d3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysImageItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysImageItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysItemProvider.java
index abefa50b2..abefa50b2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/DisplaysItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ManagesUIItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ManagesUIItemProvider.java
index 9c22dab17..9c22dab17 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ManagesUIItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ManagesUIItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReadsUIItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReadsUIItemProvider.java
index 2169ea8eb..2169ea8eb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReadsUIItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReadsUIItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReportItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReportItemProvider.java
index 8066d51ea..8066d51ea 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReportItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ReportItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ScreenItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ScreenItemProvider.java
index c5a555675..c5a555675 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ScreenItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/ScreenItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIActionItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIActionItemProvider.java
index bf609c53a..bf609c53a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIActionItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIActionItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIDisplayItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIDisplayItemProvider.java
index 91da4454a..91da4454a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIDisplayItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIDisplayItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIElementItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIElementItemProvider.java
index fb90e7c77..fb90e7c77 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIElementItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIElementItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIEventItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIEventItemProvider.java
index 430f437ac..430f437ac 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIEventItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIEventItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFieldItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFieldItemProvider.java
index 95415fe2e..95415fe2e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFieldItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFieldItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFlowItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFlowItemProvider.java
index 44d6a51b9..44d6a51b9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFlowItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIFlowItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UILayoutItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UILayoutItemProvider.java
index 7432abe3f..7432abe3f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UILayoutItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UILayoutItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIModelItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIModelItemProvider.java
index 73fc94d1b..73fc94d1b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIModelItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIModelItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIRelationshipItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIRelationshipItemProvider.java
index 52e75e973..52e75e973 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIRelationshipItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIRelationshipItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIResourceItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIResourceItemProvider.java
index 39968d7b5..39968d7b5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIResourceItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UIResourceItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UiItemProviderAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UiItemProviderAdapterFactory.java
index 34e4cd3a5..34e4cd3a5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UiItemProviderAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/UiItemProviderAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/WritesUIItemProvider.java b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/WritesUIItemProvider.java
index 5237b5c95..5237b5c95 100644
--- a/org.eclipse.gmt.modisco.omg.kdm.edit/src/org/eclipse/gmt/modisco/omg/kdm/ui/provider/WritesUIItemProvider.java
+++ b/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/provider/WritesUIItemProvider.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/.checkstyle b/org.eclipse.gmt.modisco.omg.kdm/.checkstyle
index ae9a52970..699104fb8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/.checkstyle
+++ b/org.eclipse.gmt.modisco.omg.kdm/.checkstyle
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/omg/kdm"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.omg.kdm/.classpath b/org.eclipse.gmt.modisco.omg.kdm/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/.classpath
+++ b/org.eclipse.gmt.modisco.omg.kdm/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.omg.kdm/build.properties b/org.eclipse.gmt.modisco.omg.kdm/build.properties
index e2360b899..617356afc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/build.properties
+++ b/org.eclipse.gmt.modisco.omg.kdm/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -7,9 +7,10 @@
 #

 # Contributors:

 #    Gabriel Barbier (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 # NLS_MESSAGEFORMAT_VAR

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 bin.includes = plugin.xml,\

                plugin.properties,\

diff --git a/org.eclipse.gmt.modisco.omg.kdm/model/kdm.genmodel b/org.eclipse.gmt.modisco.omg.kdm/model/kdm.genmodel
index c0a3d8622..3550efb8b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/model/kdm.genmodel
+++ b/org.eclipse.gmt.modisco.omg.kdm/model/kdm.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2009 Hatha Systems, and 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;    Nikolai Mansourov (Hatha Systems) - initial API and implementation&#xD;&#xA;    Gabriel Barbier (Mia-Software) - minor evolutions for version 1.1"

-    modelDirectory="/org.eclipse.gmt.modisco.omg.kdm/src" editDirectory="/org.eclipse.gmt.modisco.omg.kdm.edit/src"

-    editorDirectory="/org.eclipse.gmt.modisco.omg.kdm.editor/src" modelPluginID="org.eclipse.gmt.modisco.omg.kdm"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 Hatha Systems, and 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;    Nikolai Mansourov (Hatha Systems) - initial API and implementation&#xD;&#xA;    Gabriel Barbier (Mia-Software) - minor evolutions for version 1.1&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.gmt.modisco.omg.kdm/src-gen" editDirectory="/org.eclipse.gmt.modisco.omg.kdm.edit/src-gen"

+    editorDirectory="/org.eclipse.gmt.modisco.omg.kdm.editor/src-gen" modelPluginID="org.eclipse.gmt.modisco.omg.kdm"

     modelName="Kdm" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false">

   <foreignModel>kdm.ecore</foreignModel>

diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/IKDMConstants.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/IKDMConstants.java
index 9520a665d..9520a665d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/IKDMConstants.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/IKDMConstants.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/AbstractActionRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/AbstractActionRelationship.java
index 992fe1b0e..992fe1b0e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/AbstractActionRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/AbstractActionRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionElement.java
index 435fe72ca..435fe72ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionFactory.java
index e4a390134..e4a390134 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionPackage.java
index 37fffba42..37fffba42 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionRelationship.java
index 2b088e2a8..2b088e2a8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ActionRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ActionRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Addresses.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Addresses.java
index 2d1cce02b..2d1cce02b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Addresses.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Addresses.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/BlockUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/BlockUnit.java
index ccc7e29ce..ccc7e29ce 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/BlockUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/BlockUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Calls.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Calls.java
index 90d3ea5e2..90d3ea5e2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Calls.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Calls.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/CatchUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/CatchUnit.java
index 529ebf112..529ebf112 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/CatchUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/CatchUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/CompliesTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/CompliesTo.java
index 677529dcc..677529dcc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/CompliesTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/CompliesTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ControlFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ControlFlow.java
index 22b42653b..22b42653b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ControlFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ControlFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Creates.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Creates.java
index be197c3cd..be197c3cd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Creates.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Creates.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Dispatches.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Dispatches.java
index 10121158e..10121158e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Dispatches.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Dispatches.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/EntryFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/EntryFlow.java
index 6f8c22fd8..6f8c22fd8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/EntryFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/EntryFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionFlow.java
index 2aa53da4d..2aa53da4d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionUnit.java
index 191e512c8..191e512c8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ExceptionUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ExitFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ExitFlow.java
index 89797e26c..89797e26c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/ExitFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/ExitFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/FalseFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/FalseFlow.java
index 7701ec051..7701ec051 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/FalseFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/FalseFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/FinallyUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/FinallyUnit.java
index b0fdb270c..b0fdb270c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/FinallyUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/FinallyUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Flow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Flow.java
index 76613437f..76613437f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Flow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Flow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/GuardedFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/GuardedFlow.java
index 6984fceb6..6984fceb6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/GuardedFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/GuardedFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Reads.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Reads.java
index 1c2faf80d..1c2faf80d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Reads.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Reads.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Throws.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Throws.java
index 8f1e64dc7..8f1e64dc7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Throws.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Throws.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/TrueFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/TrueFlow.java
index a7771ec5d..a7771ec5d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/TrueFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/TrueFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/TryUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/TryUnit.java
index 12febfade..12febfade 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/TryUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/TryUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/UsesType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/UsesType.java
index cfa7e0d0b..cfa7e0d0b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/UsesType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/UsesType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Writes.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Writes.java
index 593359c26..593359c26 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/Writes.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/Writes.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/AbstractActionRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/AbstractActionRelationshipImpl.java
index a70824ff2..a70824ff2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/AbstractActionRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/AbstractActionRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionElementImpl.java
index bd34fe29d..bd34fe29d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionFactoryImpl.java
index d50b34805..d50b34805 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionPackageImpl.java
index eb02b706a..eb02b706a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionRelationshipImpl.java
index 7402b9506..7402b9506 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ActionRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/AddressesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/AddressesImpl.java
index 207822564..207822564 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/AddressesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/AddressesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/BlockUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/BlockUnitImpl.java
index 70fc32bbf..70fc32bbf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/BlockUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/BlockUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CallsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CallsImpl.java
index d5e6b5e8c..d5e6b5e8c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CallsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CallsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CatchUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CatchUnitImpl.java
index 9a443ed8e..9a443ed8e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CatchUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CatchUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CompliesToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CompliesToImpl.java
index 94e23e736..94e23e736 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CompliesToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CompliesToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ControlFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ControlFlowImpl.java
index fb3db5051..fb3db5051 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ControlFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ControlFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CreatesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CreatesImpl.java
index b25aa3b0b..b25aa3b0b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/CreatesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/CreatesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/DispatchesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/DispatchesImpl.java
index b30ca74f7..b30ca74f7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/DispatchesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/DispatchesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/EntryFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/EntryFlowImpl.java
index 311ac31bb..311ac31bb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/EntryFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/EntryFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionFlowImpl.java
index 1787ae7a2..1787ae7a2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionUnitImpl.java
index a573c3f67..a573c3f67 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExceptionUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExitFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExitFlowImpl.java
index f52b9d42d..f52b9d42d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExitFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ExitFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/FalseFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/FalseFlowImpl.java
index 5e169667a..5e169667a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/FalseFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/FalseFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/FinallyUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/FinallyUnitImpl.java
index 788846e8e..788846e8e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/FinallyUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/FinallyUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/FlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/FlowImpl.java
index 7c78243e9..7c78243e9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/FlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/FlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/GuardedFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/GuardedFlowImpl.java
index 6e214c7ba..6e214c7ba 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/GuardedFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/GuardedFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ReadsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ReadsImpl.java
index e7e2c5ba7..e7e2c5ba7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ReadsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ReadsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ThrowsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ThrowsImpl.java
index 6aeac8717..6aeac8717 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/ThrowsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/ThrowsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/TrueFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/TrueFlowImpl.java
index 748bfb1d6..748bfb1d6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/TrueFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/TrueFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/TryUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/TryUnitImpl.java
index 7ba35ceea..7ba35ceea 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/TryUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/TryUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/UsesTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/UsesTypeImpl.java
index f7df5669a..f7df5669a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/UsesTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/UsesTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/WritesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/WritesImpl.java
index 361d6af22..361d6af22 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/impl/WritesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/impl/WritesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionAdapterFactory.java
index afe40197c..afe40197c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionSwitch.java
index 0b6e66766..0b6e66766 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/action/util/ActionSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildElement.java
index 1520b6fe9..1520b6fe9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildRelationship.java
index c5f8e5d31..c5f8e5d31 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/AbstractBuildRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildComponent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildComponent.java
index 9158ee7d1..9158ee7d1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildComponent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildComponent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildDescription.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildDescription.java
index ebac79c11..ebac79c11 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildDescription.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildDescription.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildElement.java
index 04db3a681..04db3a681 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildFactory.java
index b0b325163..b0b325163 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildModel.java
index 7543827ee..7543827ee 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildPackage.java
index 05a2008b3..05a2008b3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildProduct.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildProduct.java
index 3396d5de6..3396d5de6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildProduct.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildProduct.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildRelationship.java
index c832dea68..c832dea68 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildResource.java
index 4724b4ce4..4724b4ce4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildStep.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildStep.java
index 63d98b1f1..63d98b1f1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/BuildStep.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/BuildStep.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Consumes.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Consumes.java
index 1d0e11129..1d0e11129 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Consumes.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Consumes.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/DescribedBy.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/DescribedBy.java
index b75956dc7..b75956dc7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/DescribedBy.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/DescribedBy.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Library.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Library.java
index 935ff25cf..935ff25cf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Library.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Library.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/LinksTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/LinksTo.java
index 1d9abb5c1..1d9abb5c1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/LinksTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/LinksTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Produces.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Produces.java
index 96372d0e6..96372d0e6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Produces.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Produces.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/SuppliedBy.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/SuppliedBy.java
index 9103f4b12..9103f4b12 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/SuppliedBy.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/SuppliedBy.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Supplier.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Supplier.java
index deec9e64e..deec9e64e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Supplier.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Supplier.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/SupportedBy.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/SupportedBy.java
index 513958714..513958714 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/SupportedBy.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/SupportedBy.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/SymbolicLink.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/SymbolicLink.java
index 11c10b174..11c10b174 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/SymbolicLink.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/SymbolicLink.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Tool.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Tool.java
index 12d575cdc..12d575cdc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/Tool.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/Tool.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildComponentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildComponentImpl.java
index d8c55727d..d8c55727d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildComponentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildComponentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildDescriptionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildDescriptionImpl.java
index 5afe785ca..5afe785ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildDescriptionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildDescriptionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildElementImpl.java
index 1ac6c32b2..1ac6c32b2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildFactoryImpl.java
index 8cf3e1909..8cf3e1909 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildModelImpl.java
index c2e1a505f..c2e1a505f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildPackageImpl.java
index 5293c4502..5293c4502 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildProductImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildProductImpl.java
index 06c672002..06c672002 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildProductImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildProductImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildRelationshipImpl.java
index de7d444cd..de7d444cd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildResourceImpl.java
index 47194bcc6..47194bcc6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildStepImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildStepImpl.java
index 439c806da..439c806da 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildStepImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/BuildStepImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/ConsumesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/ConsumesImpl.java
index 7693b0e2b..7693b0e2b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/ConsumesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/ConsumesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/DescribedByImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/DescribedByImpl.java
index 0a82906d9..0a82906d9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/DescribedByImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/DescribedByImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/LibraryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/LibraryImpl.java
index a7e4e9085..a7e4e9085 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/LibraryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/LibraryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/LinksToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/LinksToImpl.java
index 8a4a57f5a..8a4a57f5a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/LinksToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/LinksToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/ProducesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/ProducesImpl.java
index 2d9b3b838..2d9b3b838 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/ProducesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/ProducesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SuppliedByImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SuppliedByImpl.java
index f967d25a4..f967d25a4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SuppliedByImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SuppliedByImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupplierImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupplierImpl.java
index 5befcf5f4..5befcf5f4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupplierImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupplierImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupportedByImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupportedByImpl.java
index b60f0628a..b60f0628a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupportedByImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SupportedByImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SymbolicLinkImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SymbolicLinkImpl.java
index b8a8073be..b8a8073be 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/SymbolicLinkImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/SymbolicLinkImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/ToolImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/ToolImpl.java
index e5ad8290c..e5ad8290c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/impl/ToolImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/impl/ToolImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildAdapterFactory.java
index e522ef783..e522ef783 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildSwitch.java
index 1bb4c41a9..1bb4c41a9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/build/util/BuildSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeElement.java
index 12380bf6e..12380bf6e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeRelationship.java
index f8304b236..f8304b236 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/AbstractCodeRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ArrayType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ArrayType.java
index ce3af963f..ce3af963f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ArrayType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ArrayType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BagType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BagType.java
index eadccb974..eadccb974 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BagType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BagType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BitType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BitType.java
index 5378c4f43..5378c4f43 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BitType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BitType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BitstringType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BitstringType.java
index e9387e3bd..e9387e3bd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BitstringType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BitstringType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BooleanType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BooleanType.java
index 8432795ff..8432795ff 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/BooleanType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/BooleanType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CallableKind.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CallableKind.java
index d729771fe..d729771fe 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CallableKind.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CallableKind.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CallableUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CallableUnit.java
index 85925526f..85925526f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CallableUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CallableUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CharType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CharType.java
index 18a659a9a..18a659a9a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CharType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CharType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ChoiceType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ChoiceType.java
index c34b10a6c..c34b10a6c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ChoiceType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ChoiceType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ClassUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ClassUnit.java
index 5ece455ff..5ece455ff 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ClassUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ClassUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeAssembly.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeAssembly.java
index 2838aca14..2838aca14 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeAssembly.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeAssembly.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeElement.java
index 25b86fc07..25b86fc07 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeFactory.java
index 3495dff29..3495dff29 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeItem.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeItem.java
index efbfa30e2..efbfa30e2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeItem.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeItem.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeModel.java
index 9b2e70390..9b2e70390 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodePackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodePackage.java
index 597a439e7..597a439e7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodePackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodePackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeRelationship.java
index 1b58cab01..1b58cab01 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CodeRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CodeRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CommentUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CommentUnit.java
index d11ce9c01..d11ce9c01 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CommentUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CommentUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CompilationUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CompilationUnit.java
index 1a7f01aa4..1a7f01aa4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CompilationUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CompilationUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CompositeType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CompositeType.java
index fc61a6745..fc61a6745 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/CompositeType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/CompositeType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ComputationalObject.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ComputationalObject.java
index 7c92abbdf..7c92abbdf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ComputationalObject.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ComputationalObject.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ConditionalDirective.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ConditionalDirective.java
index 1e97c9cac..1e97c9cac 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ConditionalDirective.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ConditionalDirective.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ControlElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ControlElement.java
index 2d2908c6a..2d2908c6a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ControlElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ControlElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DataElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DataElement.java
index d035f4d3b..d035f4d3b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DataElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DataElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Datatype.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Datatype.java
index 2f3ed69cb..2f3ed69cb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Datatype.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Datatype.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DateType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DateType.java
index 7a61c4c5d..7a61c4c5d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DateType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DateType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DecimalType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DecimalType.java
index 98b03cdbd..98b03cdbd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DecimalType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DecimalType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DefinedType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DefinedType.java
index 034d624f8..034d624f8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DefinedType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DefinedType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DerivedType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DerivedType.java
index 20aff0ee8..20aff0ee8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/DerivedType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/DerivedType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/EnumeratedType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/EnumeratedType.java
index c83721085..c83721085 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/EnumeratedType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/EnumeratedType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Expands.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Expands.java
index cdd43fcd2..cdd43fcd2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Expands.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Expands.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ExportKind.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ExportKind.java
index ecb29aafa..ecb29aafa 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ExportKind.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ExportKind.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Extends.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Extends.java
index 2b5b11658..2b5b11658 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Extends.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Extends.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/FloatType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/FloatType.java
index c3156ea62..c3156ea62 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/FloatType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/FloatType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/GeneratedFrom.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/GeneratedFrom.java
index 0bf226b38..0bf226b38 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/GeneratedFrom.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/GeneratedFrom.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/HasType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/HasType.java
index af0aaf298..af0aaf298 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/HasType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/HasType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/HasValue.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/HasValue.java
index 5a95be7ad..5a95be7ad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/HasValue.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/HasValue.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ImplementationOf.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ImplementationOf.java
index 9480a421b..9480a421b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ImplementationOf.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ImplementationOf.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Implements.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Implements.java
index a4ad84c09..a4ad84c09 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Implements.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Implements.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Imports.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Imports.java
index 1df7e4cf9..1df7e4cf9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Imports.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Imports.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/IncludeDirective.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/IncludeDirective.java
index bd747fd33..bd747fd33 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/IncludeDirective.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/IncludeDirective.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Includes.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Includes.java
index 87abb5746..87abb5746 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Includes.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Includes.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/IndexUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/IndexUnit.java
index 5058e8f8f..5058e8f8f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/IndexUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/IndexUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/InstanceOf.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/InstanceOf.java
index 50881720d..50881720d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/InstanceOf.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/InstanceOf.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/IntegerType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/IntegerType.java
index 3a59f8676..3a59f8676 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/IntegerType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/IntegerType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/InterfaceUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/InterfaceUnit.java
index 9f5835354..9f5835354 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/InterfaceUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/InterfaceUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ItemUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ItemUnit.java
index 41500e82a..41500e82a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ItemUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ItemUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/LanguageUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/LanguageUnit.java
index fc1389193..fc1389193 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/LanguageUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/LanguageUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MacroDirective.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MacroDirective.java
index a2f791200..a2f791200 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MacroDirective.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MacroDirective.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MacroKind.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MacroKind.java
index 454e97b92..454e97b92 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MacroKind.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MacroKind.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MacroUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MacroUnit.java
index b65695565..b65695565 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MacroUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MacroUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MemberUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MemberUnit.java
index 4425d1e63..4425d1e63 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MemberUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MemberUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MethodKind.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MethodKind.java
index 150166a49..150166a49 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MethodKind.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MethodKind.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MethodUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MethodUnit.java
index c2907df3b..c2907df3b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/MethodUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/MethodUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Module.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Module.java
index 232dbf3be..232dbf3be 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Module.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Module.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Namespace.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Namespace.java
index ecd3a0ac2..ecd3a0ac2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Namespace.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Namespace.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/OctetType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/OctetType.java
index dfd409dc3..dfd409dc3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/OctetType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/OctetType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/OctetstringType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/OctetstringType.java
index 3f35167b7..3f35167b7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/OctetstringType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/OctetstringType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/OrdinalType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/OrdinalType.java
index 038f1aca8..038f1aca8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/OrdinalType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/OrdinalType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Package.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Package.java
index d1f303336..d1f303336 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Package.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Package.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ParameterKind.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ParameterKind.java
index 9d7e0fdd5..9d7e0fdd5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ParameterKind.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ParameterKind.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ParameterTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ParameterTo.java
index 9289373a2..9289373a2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ParameterTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ParameterTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ParameterUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ParameterUnit.java
index a75dddca9..a75dddca9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ParameterUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ParameterUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/PointerType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/PointerType.java
index 979b7df7d..979b7df7d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/PointerType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/PointerType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/PreprocessorDirective.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/PreprocessorDirective.java
index 77c77be2d..77c77be2d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/PreprocessorDirective.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/PreprocessorDirective.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/PrimitiveType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/PrimitiveType.java
index bb2d5c9b2..bb2d5c9b2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/PrimitiveType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/PrimitiveType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/RangeType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/RangeType.java
index 77832cb2e..77832cb2e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/RangeType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/RangeType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/RecordType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/RecordType.java
index 4c40c2a9b..4c40c2a9b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/RecordType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/RecordType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Redefines.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Redefines.java
index 57db63fea..57db63fea 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Redefines.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Redefines.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ScaledType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ScaledType.java
index 1cbe92548..1cbe92548 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ScaledType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ScaledType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SequenceType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SequenceType.java
index 08f053762..08f053762 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SequenceType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SequenceType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SetType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SetType.java
index e6afef32b..e6afef32b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SetType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SetType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SharedUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SharedUnit.java
index 3b6d60394..3b6d60394 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SharedUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SharedUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Signature.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Signature.java
index a010692f8..a010692f8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Signature.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Signature.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/StorableKind.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/StorableKind.java
index b39e890fd..b39e890fd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/StorableKind.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/StorableKind.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/StorableUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/StorableUnit.java
index e16bbe839..e16bbe839 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/StorableUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/StorableUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/StringType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/StringType.java
index 257f9a5e3..257f9a5e3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/StringType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/StringType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SynonymUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SynonymUnit.java
index 89086490b..89086490b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/SynonymUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/SynonymUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TemplateParameter.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TemplateParameter.java
index 805a18d01..805a18d01 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TemplateParameter.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TemplateParameter.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TemplateType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TemplateType.java
index 7b49e664e..7b49e664e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TemplateType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TemplateType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TemplateUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TemplateUnit.java
index 292377148..292377148 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TemplateUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TemplateUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TimeType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TimeType.java
index 101cadb72..101cadb72 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TimeType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TimeType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TypeUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TypeUnit.java
index 9a839b71b..9a839b71b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/TypeUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/TypeUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Value.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Value.java
index 74f2352bd..74f2352bd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/Value.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/Value.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ValueElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ValueElement.java
index 84676f3c7..84676f3c7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ValueElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ValueElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ValueList.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ValueList.java
index 084a7adb3..084a7adb3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/ValueList.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/ValueList.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/VariantTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/VariantTo.java
index ed3d02713..ed3d02713 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/VariantTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/VariantTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/VisibleIn.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/VisibleIn.java
index 7068299d4..7068299d4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/VisibleIn.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/VisibleIn.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/VoidType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/VoidType.java
index ce9ffe697..ce9ffe697 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/VoidType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/VoidType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeElementImpl.java
index 17811da20..17811da20 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeRelationshipImpl.java
index 4f4348669..4f4348669 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/AbstractCodeRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ArrayTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ArrayTypeImpl.java
index 7d10b48fb..7d10b48fb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ArrayTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BagTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BagTypeImpl.java
index dcd55a8a9..dcd55a8a9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BagTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BagTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitTypeImpl.java
index e79f06fa0..e79f06fa0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitstringTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitstringTypeImpl.java
index 204de3449..204de3449 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitstringTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BitstringTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BooleanTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BooleanTypeImpl.java
index ed61b1d20..ed61b1d20 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/BooleanTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/BooleanTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CallableUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CallableUnitImpl.java
index c480ff127..c480ff127 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CallableUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CallableUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CharTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CharTypeImpl.java
index f440c405d..f440c405d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CharTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CharTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ChoiceTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ChoiceTypeImpl.java
index 32a56f2b0..32a56f2b0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ChoiceTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ChoiceTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ClassUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ClassUnitImpl.java
index 584149e23..584149e23 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ClassUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ClassUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeAssemblyImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeAssemblyImpl.java
index f4ac454fa..f4ac454fa 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeAssemblyImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeAssemblyImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeElementImpl.java
index 86ca9d99b..86ca9d99b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeFactoryImpl.java
index 846a3623a..846a3623a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeItemImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeItemImpl.java
index 3bb751708..3bb751708 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeItemImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeItemImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeModelImpl.java
index 9e9e24428..9e9e24428 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodePackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodePackageImpl.java
index f13d7b19f..f13d7b19f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodePackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodePackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeRelationshipImpl.java
index cb721328e..cb721328e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CodeRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CommentUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CommentUnitImpl.java
index e4ae94e8f..e4ae94e8f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CommentUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CommentUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompilationUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompilationUnitImpl.java
index e637b5703..e637b5703 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompilationUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompositeTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompositeTypeImpl.java
index d41e7f66f..d41e7f66f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompositeTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/CompositeTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ComputationalObjectImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ComputationalObjectImpl.java
index 0e1cbe30e..0e1cbe30e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ComputationalObjectImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ComputationalObjectImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ConditionalDirectiveImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ConditionalDirectiveImpl.java
index e203c1a2e..e203c1a2e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ConditionalDirectiveImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ConditionalDirectiveImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ControlElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ControlElementImpl.java
index b805908ec..b805908ec 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ControlElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ControlElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DataElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DataElementImpl.java
index c8d1f18a5..c8d1f18a5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DataElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DataElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DatatypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DatatypeImpl.java
index 2857a6ef5..2857a6ef5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DatatypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DatatypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DateTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DateTypeImpl.java
index abaf84b8e..abaf84b8e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DateTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DateTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DecimalTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DecimalTypeImpl.java
index c48a61c7d..c48a61c7d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DecimalTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DecimalTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DefinedTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DefinedTypeImpl.java
index 50f24c2fb..50f24c2fb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DefinedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DefinedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DerivedTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DerivedTypeImpl.java
index 022533d2e..022533d2e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/DerivedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/DerivedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/EnumeratedTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/EnumeratedTypeImpl.java
index b44a5bbf2..b44a5bbf2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/EnumeratedTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/EnumeratedTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExpandsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExpandsImpl.java
index 7d46b143c..7d46b143c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExpandsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExpandsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExtendsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExtendsImpl.java
index 563e78cbf..563e78cbf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExtendsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ExtendsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/FloatTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/FloatTypeImpl.java
index ff9c6fad1..ff9c6fad1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/FloatTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/FloatTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/GeneratedFromImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/GeneratedFromImpl.java
index e7ca33d0a..e7ca33d0a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/GeneratedFromImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/GeneratedFromImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasTypeImpl.java
index b68adf370..b68adf370 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasValueImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasValueImpl.java
index 44a99a997..44a99a997 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasValueImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/HasValueImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementationOfImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementationOfImpl.java
index cec0fb578..cec0fb578 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementationOfImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementationOfImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementsImpl.java
index 5e1886343..5e1886343 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImplementsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImportsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImportsImpl.java
index 954dd6cf7..954dd6cf7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImportsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ImportsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludeDirectiveImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludeDirectiveImpl.java
index 5e1bb6b9d..5e1bb6b9d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludeDirectiveImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludeDirectiveImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludesImpl.java
index 37ff032a6..37ff032a6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IncludesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IndexUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IndexUnitImpl.java
index fe4bbd544..fe4bbd544 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IndexUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IndexUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/InstanceOfImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/InstanceOfImpl.java
index 17be12615..17be12615 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/InstanceOfImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/InstanceOfImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IntegerTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IntegerTypeImpl.java
index 431224efe..431224efe 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/IntegerTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/IntegerTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/InterfaceUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/InterfaceUnitImpl.java
index 954e2f794..954e2f794 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/InterfaceUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/InterfaceUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ItemUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ItemUnitImpl.java
index 097744a70..097744a70 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ItemUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ItemUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/LanguageUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/LanguageUnitImpl.java
index c1ece4c92..c1ece4c92 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/LanguageUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/LanguageUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroDirectiveImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroDirectiveImpl.java
index 594b49b2f..594b49b2f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroDirectiveImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroDirectiveImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroUnitImpl.java
index 769581fed..769581fed 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MacroUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MemberUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MemberUnitImpl.java
index ed1127308..ed1127308 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MemberUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MemberUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MethodUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MethodUnitImpl.java
index 3dae019c5..3dae019c5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/MethodUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/MethodUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ModuleImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ModuleImpl.java
index c374de6d3..c374de6d3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ModuleImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ModuleImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/NamespaceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/NamespaceImpl.java
index 284c96c3a..284c96c3a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/NamespaceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/NamespaceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetTypeImpl.java
index ff46ec2f6..ff46ec2f6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetstringTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetstringTypeImpl.java
index fd0e92da5..fd0e92da5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetstringTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/OctetstringTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/OrdinalTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/OrdinalTypeImpl.java
index 783c8da3b..783c8da3b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/OrdinalTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/OrdinalTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PackageImpl.java
index f2f7e5030..f2f7e5030 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterToImpl.java
index 84f64ff9c..84f64ff9c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterUnitImpl.java
index 235b3e509..235b3e509 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ParameterUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PointerTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PointerTypeImpl.java
index 9cc5e4763..9cc5e4763 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PointerTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PointerTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PreprocessorDirectiveImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PreprocessorDirectiveImpl.java
index 4e777546c..4e777546c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PreprocessorDirectiveImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PreprocessorDirectiveImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PrimitiveTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PrimitiveTypeImpl.java
index 8867b495e..8867b495e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/RangeTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/RangeTypeImpl.java
index d6f3b9747..d6f3b9747 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/RangeTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/RangeTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/RecordTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/RecordTypeImpl.java
index 7e400044c..7e400044c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/RecordTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/RecordTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/RedefinesImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/RedefinesImpl.java
index c1c336f01..c1c336f01 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/RedefinesImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/RedefinesImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ScaledTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ScaledTypeImpl.java
index bc852c0fb..bc852c0fb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ScaledTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ScaledTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SequenceTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SequenceTypeImpl.java
index 57aac4cc5..57aac4cc5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SequenceTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SequenceTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SetTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SetTypeImpl.java
index eca663dc2..eca663dc2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SetTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SetTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SharedUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SharedUnitImpl.java
index 63564d49e..63564d49e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SharedUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SharedUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SignatureImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SignatureImpl.java
index 2b5e270fa..2b5e270fa 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SignatureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SignatureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/StorableUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/StorableUnitImpl.java
index c808c916e..c808c916e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/StorableUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/StorableUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/StringTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/StringTypeImpl.java
index 93f154cec..93f154cec 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/StringTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/StringTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SynonymUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SynonymUnitImpl.java
index dd8b93f6a..dd8b93f6a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/SynonymUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/SynonymUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateParameterImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateParameterImpl.java
index 09ae77291..09ae77291 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateParameterImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateParameterImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateTypeImpl.java
index e7f2fce0f..e7f2fce0f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateUnitImpl.java
index 1e989b33e..1e989b33e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TemplateUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TimeTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TimeTypeImpl.java
index e91b47858..e91b47858 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TimeTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TimeTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TypeUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TypeUnitImpl.java
index ad37a09cf..ad37a09cf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/TypeUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/TypeUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueElementImpl.java
index 7e9453400..7e9453400 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueImpl.java
index 3786d1efc..3786d1efc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueListImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueListImpl.java
index e782790ea..e782790ea 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueListImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/ValueListImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/VariantToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/VariantToImpl.java
index 7126adaa7..7126adaa7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/VariantToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/VariantToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/VisibleInImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/VisibleInImpl.java
index 0f07c8e7f..0f07c8e7f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/VisibleInImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/VisibleInImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/VoidTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/VoidTypeImpl.java
index 6af8868b1..6af8868b1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/impl/VoidTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/impl/VoidTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeAdapterFactory.java
index e7e38a163..e7e38a163 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeSwitch.java
index 57bac93f8..57bac93f8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/code/util/CodeSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualElement.java
index 2d1fa9a96..2d1fa9a96 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualRelationship.java
index 3f1bf085f..3f1bf085f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/AbstractConceptualRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/BehaviorUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/BehaviorUnit.java
index 5d1df68b1..5d1df68b1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/BehaviorUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/BehaviorUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualContainer.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualContainer.java
index 7aa4203ef..7aa4203ef 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualContainer.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualContainer.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualElement.java
index da6a6fd4e..da6a6fd4e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFactory.java
index 9c8012bf9..9c8012bf9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFlow.java
index 385afc756..385afc756 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualModel.java
index f09547b86..f09547b86 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualPackage.java
index aa855bf84..aa855bf84 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRelationship.java
index edbe27d18..edbe27d18 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRole.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRole.java
index 5f71f1cce..5f71f1cce 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRole.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ConceptualRole.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/FactUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/FactUnit.java
index 168ec5d8f..168ec5d8f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/FactUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/FactUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/RuleUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/RuleUnit.java
index 08f0bfe31..08f0bfe31 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/RuleUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/RuleUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ScenarioUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ScenarioUnit.java
index 97fdfedf4..97fdfedf4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/ScenarioUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/ScenarioUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/TermUnit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/TermUnit.java
index 700a1bf57..700a1bf57 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/TermUnit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/TermUnit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/BehaviorUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/BehaviorUnitImpl.java
index 2e2d35ac8..2e2d35ac8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/BehaviorUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/BehaviorUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualContainerImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualContainerImpl.java
index 4b4151657..4b4151657 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualContainerImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualElementImpl.java
index 0c38aec89..0c38aec89 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFactoryImpl.java
index 88baaeb31..88baaeb31 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFlowImpl.java
index 887146868..887146868 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualModelImpl.java
index 0ffd467b3..0ffd467b3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualPackageImpl.java
index 0834d6cd6..0834d6cd6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRelationshipImpl.java
index 41e84ddb1..41e84ddb1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRoleImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRoleImpl.java
index b0919f9d5..b0919f9d5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRoleImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ConceptualRoleImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/FactUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/FactUnitImpl.java
index 38aa58f60..38aa58f60 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/FactUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/FactUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/RuleUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/RuleUnitImpl.java
index 0ebde3a20..0ebde3a20 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/RuleUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/RuleUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ScenarioUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ScenarioUnitImpl.java
index 1d3fe6100..1d3fe6100 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ScenarioUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/ScenarioUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/TermUnitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/TermUnitImpl.java
index dc243e938..dc243e938 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/TermUnitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/impl/TermUnitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualAdapterFactory.java
index 7f3c61781..7f3c61781 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualSwitch.java
index 3d6de6cb3..3d6de6cb3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/conceptual/util/ConceptualSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/AggregatedRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/AggregatedRelationship.java
index e2444650b..e2444650b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/AggregatedRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/AggregatedRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/CoreFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/CoreFactory.java
index d519f2d39..d519f2d39 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/CoreFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/CoreFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/CorePackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/CorePackage.java
index d95177243..d95177243 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/CorePackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/CorePackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/Element.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/Element.java
index 4eda25425..4eda25425 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/Element.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/Element.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/KDMEntity.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/KDMEntity.java
index a0aec190f..a0aec190f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/KDMEntity.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/KDMEntity.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/KDMRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/KDMRelationship.java
index d1204913c..d1204913c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/KDMRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/KDMRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/ModelElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/ModelElement.java
index 4c746717c..4c746717c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/ModelElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/ModelElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/AggregatedRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/AggregatedRelationshipImpl.java
index 116fe932e..116fe932e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/AggregatedRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/AggregatedRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/CoreFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/CoreFactoryImpl.java
index 716ebb348..716ebb348 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/CoreFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/CoreFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/CorePackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/CorePackageImpl.java
index 69a48c106..69a48c106 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/CorePackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/CorePackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/ElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/ElementImpl.java
index a588ba81e..a588ba81e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/ElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/ElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMEntityImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMEntityImpl.java
index b81ae69bb..b81ae69bb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMEntityImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMEntityImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMRelationshipImpl.java
index 3d7c8f05c..3d7c8f05c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/KDMRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/ModelElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/ModelElementImpl.java
index 9f2bc5ccf..9f2bc5ccf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/impl/ModelElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/impl/ModelElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreAdapterFactory.java
index ffbe6381c..ffbe6381c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreSwitch.java
index a09c96af2..a09c96af2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/core/util/CoreSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AbstractContentElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AbstractContentElement.java
index 048d9b08e..048d9b08e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AbstractContentElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AbstractContentElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataElement.java
index b235ef681..b235ef681 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataRelationship.java
index f772ff2d1..f772ff2d1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AbstractDataRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AllContent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AllContent.java
index 681981656..681981656 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/AllContent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/AllContent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/Catalog.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/Catalog.java
index b4c900999..b4c900999 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/Catalog.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/Catalog.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ChoiceContent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ChoiceContent.java
index 87591faa3..87591faa3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ChoiceContent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ChoiceContent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ColumnSet.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ColumnSet.java
index 506aa9575..506aa9575 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ColumnSet.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ColumnSet.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ComplexContentType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ComplexContentType.java
index dfd7e6c90..dfd7e6c90 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ComplexContentType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ComplexContentType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentAttribute.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentAttribute.java
index 63a437156..63a437156 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentAttribute.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentAttribute.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentElement.java
index 2b6efbc8a..2b6efbc8a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentItem.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentItem.java
index 6f307c747..6f307c747 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentItem.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentItem.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentReference.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentReference.java
index 124b7ea87..124b7ea87 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentReference.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentReference.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentRestriction.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentRestriction.java
index e770705f6..e770705f6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ContentRestriction.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ContentRestriction.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataAction.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataAction.java
index 7b948a6ca..7b948a6ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataAction.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataAction.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataContainer.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataContainer.java
index d5067d53b..d5067d53b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataContainer.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataContainer.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataEvent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataEvent.java
index 4e0ab78e7..4e0ab78e7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataEvent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataEvent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataFactory.java
index 428e8c26a..428e8c26a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataModel.java
index 5797e086c..5797e086c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataPackage.java
index efda78ad0..efda78ad0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataRelationship.java
index dc4465a76..dc4465a76 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataResource.java
index fc4443245..fc4443245 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataSegment.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataSegment.java
index 557b00aa9..557b00aa9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DataSegment.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DataSegment.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DatatypeOf.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DatatypeOf.java
index 5778f4ea8..5778f4ea8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/DatatypeOf.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/DatatypeOf.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ExtendedDataElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ExtendedDataElement.java
index 0e812c492..0e812c492 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ExtendedDataElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ExtendedDataElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ExtensionTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ExtensionTo.java
index 24fd1482f..24fd1482f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ExtensionTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ExtensionTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/GroupContent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/GroupContent.java
index 0c31b25bc..0c31b25bc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/GroupContent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/GroupContent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/HasContent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/HasContent.java
index dbd104bdb..dbd104bdb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/HasContent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/HasContent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/Index.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/Index.java
index e3e0fc161..e3e0fc161 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/Index.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/Index.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/IndexElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/IndexElement.java
index fa6091d4e..fa6091d4e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/IndexElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/IndexElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/KeyRelation.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/KeyRelation.java
index 28e89b59a..28e89b59a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/KeyRelation.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/KeyRelation.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ManagesData.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ManagesData.java
index f1b300ee7..f1b300ee7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ManagesData.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ManagesData.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/MixedContent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/MixedContent.java
index befb210a0..befb210a0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/MixedContent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/MixedContent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ProducesDataEvent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ProducesDataEvent.java
index 2339bd3aa..2339bd3aa 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ProducesDataEvent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ProducesDataEvent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ReadsColumnSet.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ReadsColumnSet.java
index de96dd852..de96dd852 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ReadsColumnSet.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ReadsColumnSet.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RecordFile.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RecordFile.java
index ebc720741..ebc720741 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RecordFile.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RecordFile.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceKey.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceKey.java
index b6cf94dbf..b6cf94dbf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceKey.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceKey.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceTo.java
index 1bea287b1..1bea287b1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/ReferenceTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RelationalSchema.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RelationalSchema.java
index 41ddaba1d..41ddaba1d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RelationalSchema.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RelationalSchema.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RelationalTable.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RelationalTable.java
index efe24afb3..efe24afb3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RelationalTable.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RelationalTable.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RelationalView.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RelationalView.java
index acd940cd3..acd940cd3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RelationalView.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RelationalView.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RestrictionOf.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RestrictionOf.java
index 91d9b5af3..91d9b5af3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/RestrictionOf.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/RestrictionOf.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/SeqContent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/SeqContent.java
index 6b4b205fa..6b4b205fa 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/SeqContent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/SeqContent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/SimpleContentType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/SimpleContentType.java
index 819906516..819906516 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/SimpleContentType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/SimpleContentType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/TypedBy.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/TypedBy.java
index 21262dd2e..21262dd2e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/TypedBy.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/TypedBy.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/UniqueKey.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/UniqueKey.java
index 61da995fb..61da995fb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/UniqueKey.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/UniqueKey.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/WritesColumnSet.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/WritesColumnSet.java
index 75f5a1873..75f5a1873 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/WritesColumnSet.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/WritesColumnSet.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/XMLSchema.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/XMLSchema.java
index ce585161f..ce585161f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/XMLSchema.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/XMLSchema.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/AllContentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/AllContentImpl.java
index 040e6610d..040e6610d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/AllContentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/AllContentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/CatalogImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/CatalogImpl.java
index b6323e7c4..b6323e7c4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/CatalogImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/CatalogImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ChoiceContentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ChoiceContentImpl.java
index 49b967a71..49b967a71 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ChoiceContentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ChoiceContentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ColumnSetImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ColumnSetImpl.java
index c11b9f0b5..c11b9f0b5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ColumnSetImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ColumnSetImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ComplexContentTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ComplexContentTypeImpl.java
index ca3b71e47..ca3b71e47 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ComplexContentTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ComplexContentTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentAttributeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentAttributeImpl.java
index 688330bbe..688330bbe 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentAttributeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentAttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentElementImpl.java
index 0e1a2d61c..0e1a2d61c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentItemImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentItemImpl.java
index 0061d11a0..0061d11a0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentItemImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentItemImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentReferenceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentReferenceImpl.java
index 9f9f15951..9f9f15951 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentReferenceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentReferenceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentRestrictionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentRestrictionImpl.java
index f4798f5d3..f4798f5d3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentRestrictionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ContentRestrictionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataActionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataActionImpl.java
index 67a0d888a..67a0d888a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataActionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataActionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataContainerImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataContainerImpl.java
index 342184431..342184431 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataContainerImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataEventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataEventImpl.java
index 76caa3da2..76caa3da2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataEventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataEventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataFactoryImpl.java
index e0d429f44..e0d429f44 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataModelImpl.java
index f063a8ea2..f063a8ea2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataPackageImpl.java
index 45aed0046..45aed0046 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataRelationshipImpl.java
index d1f8e9731..d1f8e9731 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataResourceImpl.java
index 710610f46..710610f46 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataSegmentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataSegmentImpl.java
index 2a194f5ca..2a194f5ca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataSegmentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DataSegmentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DatatypeOfImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DatatypeOfImpl.java
index 6234d4049..6234d4049 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/DatatypeOfImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/DatatypeOfImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtendedDataElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtendedDataElementImpl.java
index 2c1ad59de..2c1ad59de 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtendedDataElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtendedDataElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtensionToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtensionToImpl.java
index 077780087..077780087 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtensionToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ExtensionToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/GroupContentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/GroupContentImpl.java
index 7953daac9..7953daac9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/GroupContentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/GroupContentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/HasContentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/HasContentImpl.java
index d1a9fec85..d1a9fec85 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/HasContentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/HasContentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexElementImpl.java
index a9d163e6f..a9d163e6f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexImpl.java
index aa7c02515..aa7c02515 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/IndexImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/KeyRelationImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/KeyRelationImpl.java
index 137afd5fa..137afd5fa 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/KeyRelationImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/KeyRelationImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ManagesDataImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ManagesDataImpl.java
index ab38e9090..ab38e9090 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ManagesDataImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ManagesDataImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/MixedContentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/MixedContentImpl.java
index d0bc244bb..d0bc244bb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/MixedContentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/MixedContentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ProducesDataEventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ProducesDataEventImpl.java
index 4add9e7df..4add9e7df 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ProducesDataEventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ProducesDataEventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReadsColumnSetImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReadsColumnSetImpl.java
index 7d5058ff9..7d5058ff9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReadsColumnSetImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReadsColumnSetImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RecordFileImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RecordFileImpl.java
index 6a816aa20..6a816aa20 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RecordFileImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RecordFileImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceKeyImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceKeyImpl.java
index b535cc596..b535cc596 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceKeyImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceKeyImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceToImpl.java
index ecba0aff0..ecba0aff0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/ReferenceToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalSchemaImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalSchemaImpl.java
index 43e43f252..43e43f252 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalSchemaImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalSchemaImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalTableImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalTableImpl.java
index c05d72336..c05d72336 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalTableImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalTableImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalViewImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalViewImpl.java
index c7dc946ad..c7dc946ad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalViewImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RelationalViewImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RestrictionOfImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RestrictionOfImpl.java
index 5c47a17ed..5c47a17ed 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/RestrictionOfImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/RestrictionOfImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/SeqContentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/SeqContentImpl.java
index b863bcb09..b863bcb09 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/SeqContentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/SeqContentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/SimpleContentTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/SimpleContentTypeImpl.java
index b14fad289..b14fad289 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/SimpleContentTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/SimpleContentTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/TypedByImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/TypedByImpl.java
index 04e8ee612..04e8ee612 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/TypedByImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/TypedByImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/UniqueKeyImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/UniqueKeyImpl.java
index 659eca351..659eca351 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/UniqueKeyImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/UniqueKeyImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/WritesColumnSetImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/WritesColumnSetImpl.java
index 1c676997f..1c676997f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/WritesColumnSetImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/WritesColumnSetImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/XMLSchemaImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/XMLSchemaImpl.java
index afe37562a..afe37562a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/impl/XMLSchemaImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/impl/XMLSchemaImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/util/DataAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/util/DataAdapterFactory.java
index 79bab7b9e..79bab7b9e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/util/DataAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/util/DataAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/util/DataSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/util/DataSwitch.java
index 79773a6fb..79773a6fb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/data/util/DataSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/data/util/DataSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventElement.java
index fc40712df..fc40712df 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventRelationship.java
index f60d60afc..f60d60afc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/AbstractEventRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/ConsumesEvent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/ConsumesEvent.java
index f78bf8583..f78bf8583 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/ConsumesEvent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/ConsumesEvent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/Event.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/Event.java
index 0ee19764f..0ee19764f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/Event.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/Event.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventAction.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventAction.java
index c1cf455a1..c1cf455a1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventAction.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventAction.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventElement.java
index 859862f68..859862f68 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventFactory.java
index 970f16eb7..970f16eb7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventModel.java
index 1cc3b889e..1cc3b889e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventPackage.java
index 27e57220c..27e57220c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventRelationship.java
index 9e44531ae..9e44531ae 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventResource.java
index 6b182beff..6b182beff 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/EventResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/EventResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/HasState.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/HasState.java
index b49d344e8..b49d344e8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/HasState.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/HasState.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/InitialState.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/InitialState.java
index 50573a8b8..50573a8b8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/InitialState.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/InitialState.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/NextState.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/NextState.java
index 3f099468f..3f099468f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/NextState.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/NextState.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/OnEntry.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/OnEntry.java
index 6d8dc3424..6d8dc3424 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/OnEntry.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/OnEntry.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/OnExit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/OnExit.java
index 2b9d5b560..2b9d5b560 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/OnExit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/OnExit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/ProducesEvent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/ProducesEvent.java
index 952a2087e..952a2087e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/ProducesEvent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/ProducesEvent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/ReadsState.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/ReadsState.java
index 6650618b1..6650618b1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/ReadsState.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/ReadsState.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/State.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/State.java
index 9a2e04179..9a2e04179 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/State.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/State.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/Transition.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/Transition.java
index cc6942c41..cc6942c41 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/Transition.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/Transition.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/ConsumesEventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/ConsumesEventImpl.java
index 531342d77..531342d77 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/ConsumesEventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/ConsumesEventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventActionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventActionImpl.java
index 53d84e785..53d84e785 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventActionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventActionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventElementImpl.java
index 649596324..649596324 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventFactoryImpl.java
index 6379c9695..6379c9695 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventImpl.java
index 8ece93d70..8ece93d70 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventModelImpl.java
index 63a1ddc44..63a1ddc44 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventPackageImpl.java
index d74b88449..d74b88449 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventRelationshipImpl.java
index c5fc5a1d9..c5fc5a1d9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventResourceImpl.java
index 25f9731eb..25f9731eb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/EventResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/HasStateImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/HasStateImpl.java
index a56d44d6d..a56d44d6d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/HasStateImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/HasStateImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/InitialStateImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/InitialStateImpl.java
index c4a22bdc9..c4a22bdc9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/InitialStateImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/InitialStateImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/NextStateImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/NextStateImpl.java
index e110a1186..e110a1186 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/NextStateImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/NextStateImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnEntryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnEntryImpl.java
index 846199300..846199300 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnEntryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnEntryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnExitImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnExitImpl.java
index dfc5edb25..dfc5edb25 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnExitImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/OnExitImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/ProducesEventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/ProducesEventImpl.java
index 048602281..048602281 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/ProducesEventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/ProducesEventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/ReadsStateImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/ReadsStateImpl.java
index 569919c1b..569919c1b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/ReadsStateImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/ReadsStateImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/StateImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/StateImpl.java
index c4c666fce..c4c666fce 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/StateImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/StateImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/TransitionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/TransitionImpl.java
index 7dfcfd999..7dfcfd999 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/impl/TransitionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/impl/TransitionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/util/EventAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/util/EventAdapterFactory.java
index 2dc383ba5..2dc383ba5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/util/EventAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/util/EventAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/util/EventSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/util/EventSwitch.java
index 1ef740465..1ef740465 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/event/util/EventSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/event/util/EventSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Annotation.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Annotation.java
index e96143114..e96143114 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Annotation.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Annotation.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Attribute.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Attribute.java
index d119e4fa5..d119e4fa5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Attribute.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Attribute.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Audit.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Audit.java
index e1399eafb..e1399eafb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Audit.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Audit.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtendedValue.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtendedValue.java
index 6c051b4d5..6c051b4d5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtendedValue.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtendedValue.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtensionFamily.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtensionFamily.java
index e3d9d80de..e3d9d80de 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtensionFamily.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/ExtensionFamily.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMFramework.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMFramework.java
index cbe95fa6d..cbe95fa6d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMFramework.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMFramework.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMModel.java
index 1e55a87d9..1e55a87d9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KDMModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmFactory.java
index 7b75fd619..7b75fd619 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmPackage.java
index 4cbe50575..4cbe50575 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/KdmPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Segment.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Segment.java
index b6c2eeaa1..b6c2eeaa1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Segment.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Segment.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Stereotype.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Stereotype.java
index f41c6e46c..f41c6e46c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/Stereotype.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/Stereotype.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/TagDefinition.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/TagDefinition.java
index 7a014dd54..7a014dd54 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/TagDefinition.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/TagDefinition.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedRef.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedRef.java
index 821c97591..821c97591 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedRef.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedRef.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedValue.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedValue.java
index 2692c82a0..2692c82a0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedValue.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/TaggedValue.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AnnotationImpl.java
index da241306f..da241306f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AttributeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AttributeImpl.java
index f588a006c..f588a006c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AttributeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AuditImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AuditImpl.java
index 5148aa918..5148aa918 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AuditImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/AuditImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtendedValueImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtendedValueImpl.java
index 378046fcf..378046fcf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtendedValueImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtendedValueImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtensionFamilyImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtensionFamilyImpl.java
index 0e30f824e..0e30f824e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtensionFamilyImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/ExtensionFamilyImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMFrameworkImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMFrameworkImpl.java
index 327805aeb..327805aeb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMFrameworkImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMFrameworkImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMModelImpl.java
index 4c33a5244..4c33a5244 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KDMModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmFactoryImpl.java
index 84cc037b0..84cc037b0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmPackageImpl.java
index 8d9632d47..8d9632d47 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/KdmPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/SegmentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/SegmentImpl.java
index a83007c4d..a83007c4d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/SegmentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/SegmentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/StereotypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/StereotypeImpl.java
index 822f32120..822f32120 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/StereotypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/StereotypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TagDefinitionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TagDefinitionImpl.java
index 92d8e2835..92d8e2835 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TagDefinitionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TagDefinitionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedRefImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedRefImpl.java
index 0018f8a30..0018f8a30 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedRefImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedRefImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedValueImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedValueImpl.java
index ba388836f..ba388836f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedValueImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/impl/TaggedValueImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmAdapterFactory.java
index 55282ac13..55282ac13 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmSwitch.java
index a3348b4e2..a3348b4e2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/kdm/util/KdmSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformElement.java
index 76db2e711..76db2e711 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformRelationship.java
index 3e0ae0b63..3e0ae0b63 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/AbstractPlatformRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/BindsTo.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/BindsTo.java
index fdc8643e3..fdc8643e3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/BindsTo.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/BindsTo.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DataManager.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DataManager.java
index 9e321e5e2..9e321e5e2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DataManager.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DataManager.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DefinedBy.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DefinedBy.java
index 0d9df493b..0d9df493b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DefinedBy.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DefinedBy.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedComponent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedComponent.java
index 057caeb6b..057caeb6b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedComponent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedComponent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedResource.java
index be0137ed9..be0137ed9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedSoftwareSystem.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedSoftwareSystem.java
index 3c07af4d2..3c07af4d2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedSoftwareSystem.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/DeployedSoftwareSystem.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ExecutionResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ExecutionResource.java
index fe09e6a7f..fe09e6a7f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ExecutionResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ExecutionResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ExternalActor.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ExternalActor.java
index 3b0068a4e..3b0068a4e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ExternalActor.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ExternalActor.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/FileResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/FileResource.java
index 0ac1889da..0ac1889da 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/FileResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/FileResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Loads.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Loads.java
index a010ee582..a010ee582 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Loads.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Loads.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/LockResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/LockResource.java
index 1156b6ccf..1156b6ccf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/LockResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/LockResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Machine.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Machine.java
index 02c54e00c..02c54e00c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Machine.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Machine.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ManagesResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ManagesResource.java
index 5cd3e664f..5cd3e664f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ManagesResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ManagesResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/MarshalledResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/MarshalledResource.java
index 99cd6849f..99cd6849f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/MarshalledResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/MarshalledResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/MessagingResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/MessagingResource.java
index bf7c88882..bf7c88882 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/MessagingResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/MessagingResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/NamingResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/NamingResource.java
index e866a1f2e..e866a1f2e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/NamingResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/NamingResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformAction.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformAction.java
index 175ca2f73..175ca2f73 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformAction.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformAction.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformElement.java
index 208b8b4ed..208b8b4ed 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformEvent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformEvent.java
index 001ae229f..001ae229f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformEvent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformEvent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformFactory.java
index 032ca1854..032ca1854 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformModel.java
index 11b9ee9a5..11b9ee9a5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformPackage.java
index 1901359d6..1901359d6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformRelationship.java
index b134b78a2..b134b78a2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/PlatformRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Process.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Process.java
index 5742f2d1b..5742f2d1b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Process.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Process.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ReadsResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ReadsResource.java
index 770360342..770360342 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ReadsResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ReadsResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Requires.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Requires.java
index c15d2596a..c15d2596a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Requires.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Requires.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ResourceType.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ResourceType.java
index a279878fb..a279878fb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/ResourceType.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/ResourceType.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/RuntimeResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/RuntimeResource.java
index 90e4ee7d7..90e4ee7d7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/RuntimeResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/RuntimeResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Spawns.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Spawns.java
index e845ddc88..e845ddc88 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Spawns.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Spawns.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/StreamResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/StreamResource.java
index ea1eb048a..ea1eb048a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/StreamResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/StreamResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Thread.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Thread.java
index b8e5b520c..b8e5b520c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/Thread.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/Thread.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/WritesResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/WritesResource.java
index 7db6bfb84..7db6bfb84 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/WritesResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/WritesResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformElementImpl.java
index 3279ddfbd..3279ddfbd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformRelationshipImpl.java
index 580f13b7e..580f13b7e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/AbstractPlatformRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/BindsToImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/BindsToImpl.java
index e51cb4b1c..e51cb4b1c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/BindsToImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/BindsToImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DataManagerImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DataManagerImpl.java
index 0a6961784..0a6961784 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DataManagerImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DataManagerImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DefinedByImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DefinedByImpl.java
index bd91fcc28..bd91fcc28 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DefinedByImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DefinedByImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedComponentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedComponentImpl.java
index 7fb20ea09..7fb20ea09 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedComponentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedComponentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedResourceImpl.java
index 734f8336f..734f8336f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedSoftwareSystemImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedSoftwareSystemImpl.java
index 87a4c7732..87a4c7732 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedSoftwareSystemImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/DeployedSoftwareSystemImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExecutionResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExecutionResourceImpl.java
index 3fa1dca26..3fa1dca26 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExecutionResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExecutionResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExternalActorImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExternalActorImpl.java
index 4e65da4e2..4e65da4e2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExternalActorImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ExternalActorImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/FileResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/FileResourceImpl.java
index 9b33037d1..9b33037d1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/FileResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/FileResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LoadsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LoadsImpl.java
index f363bf06d..f363bf06d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LoadsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LoadsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LockResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LockResourceImpl.java
index cb8cb5aee..cb8cb5aee 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LockResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/LockResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MachineImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MachineImpl.java
index 7ff9a262b..7ff9a262b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MachineImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MachineImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ManagesResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ManagesResourceImpl.java
index 2779de6c1..2779de6c1 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ManagesResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ManagesResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MarshalledResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MarshalledResourceImpl.java
index 2563c486c..2563c486c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MarshalledResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MarshalledResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MessagingResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MessagingResourceImpl.java
index 6d54762c7..6d54762c7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MessagingResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/MessagingResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/NamingResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/NamingResourceImpl.java
index 769a8e716..769a8e716 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/NamingResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/NamingResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformActionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformActionImpl.java
index bc0a42ed5..bc0a42ed5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformActionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformActionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformElementImpl.java
index e0c412b67..e0c412b67 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformEventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformEventImpl.java
index 1a49e03df..1a49e03df 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformEventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformEventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformFactoryImpl.java
index 11de06c7e..11de06c7e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformModelImpl.java
index 4ce2c1903..4ce2c1903 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformPackageImpl.java
index 1975048d6..1975048d6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformRelationshipImpl.java
index 68cd80199..68cd80199 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/PlatformRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ProcessImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ProcessImpl.java
index 0216e8aef..0216e8aef 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ProcessImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ProcessImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ReadsResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ReadsResourceImpl.java
index c1543d31d..c1543d31d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ReadsResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ReadsResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RequiresImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RequiresImpl.java
index 1eec42941..1eec42941 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RequiresImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RequiresImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ResourceTypeImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ResourceTypeImpl.java
index 49680e997..49680e997 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ResourceTypeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ResourceTypeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RuntimeResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RuntimeResourceImpl.java
index 8d8ecac82..8d8ecac82 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RuntimeResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/RuntimeResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/SpawnsImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/SpawnsImpl.java
index e93d081d2..e93d081d2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/SpawnsImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/SpawnsImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/StreamResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/StreamResourceImpl.java
index 3562ebfcb..3562ebfcb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/StreamResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/StreamResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ThreadImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ThreadImpl.java
index 24df81cca..24df81cca 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ThreadImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/ThreadImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/WritesResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/WritesResourceImpl.java
index 22d6b830c..22d6b830c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/impl/WritesResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/impl/WritesResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformAdapterFactory.java
index 8b9c7a585..8b9c7a585 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformSwitch.java
index 8982008b7..8982008b7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/platform/util/PlatformSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryElement.java
index 119359135..119359135 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryRelationship.java
index 255a8926a..255a8926a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/AbstractInventoryRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/BinaryFile.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/BinaryFile.java
index b3a79aa72..b3a79aa72 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/BinaryFile.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/BinaryFile.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Configuration.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Configuration.java
index 7e6dac59c..7e6dac59c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Configuration.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Configuration.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/DependsOn.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/DependsOn.java
index 2065412bf..2065412bf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/DependsOn.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/DependsOn.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Directory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Directory.java
index 8b038c34f..8b038c34f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Directory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Directory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/ExecutableFile.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/ExecutableFile.java
index 5b031380a..5b031380a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/ExecutableFile.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/ExecutableFile.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Image.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Image.java
index 4831c742d..4831c742d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Image.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Image.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryContainer.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryContainer.java
index a3b50d57d..a3b50d57d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryContainer.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryContainer.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryElement.java
index bfed1484a..bfed1484a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryItem.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryItem.java
index 6aa4a4bee..6aa4a4bee 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryItem.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryItem.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryModel.java
index d6ec8f420..d6ec8f420 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryRelationship.java
index 1d3a8dfc9..1d3a8dfc9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/InventoryRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/InventoryRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Project.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Project.java
index 3f1cfe779..3f1cfe779 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/Project.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/Project.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/ResourceDescription.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/ResourceDescription.java
index 5c86f8aba..5c86f8aba 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/ResourceDescription.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/ResourceDescription.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceFactory.java
index 9e5d348b7..9e5d348b7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceFile.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceFile.java
index 95c11558b..95c11558b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceFile.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceFile.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourcePackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourcePackage.java
index 43e14c458..43e14c458 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourcePackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourcePackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceRef.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceRef.java
index 47fa81a30..47fa81a30 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceRef.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceRef.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceRegion.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceRegion.java
index 02878787f..02878787f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/SourceRegion.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/SourceRegion.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryElementImpl.java
index 1ee123892..1ee123892 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryRelationshipImpl.java
index 595d2ffb0..595d2ffb0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/AbstractInventoryRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/BinaryFileImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/BinaryFileImpl.java
index c467e03af..c467e03af 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/BinaryFileImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/BinaryFileImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ConfigurationImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ConfigurationImpl.java
index 43960559c..43960559c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ConfigurationImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ConfigurationImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/DependsOnImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/DependsOnImpl.java
index fb002e6c8..fb002e6c8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/DependsOnImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/DependsOnImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/DirectoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/DirectoryImpl.java
index 0d93fa374..0d93fa374 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/DirectoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/DirectoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ExecutableFileImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ExecutableFileImpl.java
index 36686ece2..36686ece2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ExecutableFileImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ExecutableFileImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ImageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ImageImpl.java
index fe245b0a9..fe245b0a9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ImageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ImageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryContainerImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryContainerImpl.java
index e04482273..e04482273 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryContainerImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryContainerImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryElementImpl.java
index 6c88f5cf7..6c88f5cf7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryItemImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryItemImpl.java
index 579ba92b8..579ba92b8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryItemImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryItemImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryModelImpl.java
index 82ae648bf..82ae648bf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryRelationshipImpl.java
index 783943d6a..783943d6a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/InventoryRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ProjectImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ProjectImpl.java
index 7bead69b6..7bead69b6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ProjectImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ProjectImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ResourceDescriptionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ResourceDescriptionImpl.java
index b00f464e7..b00f464e7 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/ResourceDescriptionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/ResourceDescriptionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFactoryImpl.java
index 8f06f45c6..8f06f45c6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFileImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFileImpl.java
index d378e98c6..d378e98c6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFileImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceFileImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourcePackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourcePackageImpl.java
index 406ce3018..406ce3018 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourcePackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourcePackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRefImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRefImpl.java
index be57c5fc5..be57c5fc5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRefImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRefImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRegionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRegionImpl.java
index e51de1f2a..e51de1f2a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRegionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/impl/SourceRegionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/util/KDMSourceUtils.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/util/KDMSourceUtils.java
index 2692db99e..2692db99e 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/util/KDMSourceUtils.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/util/KDMSourceUtils.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceAdapterFactory.java
index b455e034c..b455e034c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceSwitch.java
index 2b2540fd9..2b2540fd9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/source/util/SourceSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureElement.java
index 75e128e7c..75e128e7c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureRelationship.java
index 5c09b7135..5c09b7135 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/AbstractStructureRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/ArchitectureView.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/ArchitectureView.java
index afbe3174b..afbe3174b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/ArchitectureView.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/ArchitectureView.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/Component.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/Component.java
index c3a5b9441..c3a5b9441 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/Component.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/Component.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/Layer.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/Layer.java
index ca4468ef2..ca4468ef2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/Layer.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/Layer.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/SoftwareSystem.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/SoftwareSystem.java
index e746dcb53..e746dcb53 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/SoftwareSystem.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/SoftwareSystem.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureElement.java
index ddfffc305..ddfffc305 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureFactory.java
index 3df72f1ea..3df72f1ea 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureModel.java
index 62d59861f..62d59861f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructurePackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructurePackage.java
index 316a4561a..316a4561a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructurePackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructurePackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureRelationship.java
index 6220ceab2..6220ceab2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/StructureRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/StructureRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/Subsystem.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/Subsystem.java
index 113d18cc8..113d18cc8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/Subsystem.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/Subsystem.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ArchitectureViewImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ArchitectureViewImpl.java
index 2fbd3d688..2fbd3d688 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ArchitectureViewImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ArchitectureViewImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ComponentImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ComponentImpl.java
index 56abe3b04..56abe3b04 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ComponentImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/ComponentImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/LayerImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/LayerImpl.java
index c5524c488..c5524c488 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/LayerImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/LayerImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SoftwareSystemImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SoftwareSystemImpl.java
index 99e54c2ad..99e54c2ad 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SoftwareSystemImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SoftwareSystemImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureElementImpl.java
index 30a215014..30a215014 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureFactoryImpl.java
index 2b572925a..2b572925a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureModelImpl.java
index 2cc8a37e3..2cc8a37e3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructurePackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructurePackageImpl.java
index 9b0ea9ca8..9b0ea9ca8 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructurePackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructurePackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureRelationshipImpl.java
index 9ca1bd9cc..9ca1bd9cc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/StructureRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SubsystemImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SubsystemImpl.java
index 680138df5..680138df5 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SubsystemImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/impl/SubsystemImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureAdapterFactory.java
index 1b1d518c6..1b1d518c6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureSwitch.java
index 411f99c64..411f99c64 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/structure/util/StructureSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIElement.java
index b668f0149..b668f0149 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIRelationship.java
index c87642d8c..c87642d8c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/AbstractUIRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/Displays.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/Displays.java
index 00c6cce56..00c6cce56 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/Displays.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/Displays.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/DisplaysImage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/DisplaysImage.java
index 5c628a852..5c628a852 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/DisplaysImage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/DisplaysImage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/ManagesUI.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/ManagesUI.java
index d1401f878..d1401f878 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/ManagesUI.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/ManagesUI.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/ReadsUI.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/ReadsUI.java
index febe1d51d..febe1d51d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/ReadsUI.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/ReadsUI.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/Report.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/Report.java
index e3d44db42..e3d44db42 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/Report.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/Report.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/Screen.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/Screen.java
index 6bf1c4986..6bf1c4986 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/Screen.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/Screen.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIAction.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIAction.java
index 95336c517..95336c517 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIAction.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIAction.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIDisplay.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIDisplay.java
index d01d26fd2..d01d26fd2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIDisplay.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIDisplay.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIElement.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIElement.java
index 890fb0c0b..890fb0c0b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIElement.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIElement.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIEvent.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIEvent.java
index 455af5203..455af5203 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIEvent.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIEvent.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIField.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIField.java
index 2d4729abf..2d4729abf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIField.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIField.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIFlow.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIFlow.java
index 0b562cd8b..0b562cd8b 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIFlow.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIFlow.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UILayout.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UILayout.java
index e4322b23a..e4322b23a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UILayout.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UILayout.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIModel.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIModel.java
index 30e58411a..30e58411a 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIModel.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIModel.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIRelationship.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIRelationship.java
index a0dbc9708..a0dbc9708 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIResource.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIResource.java
index 1877add71..1877add71 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UIResource.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UIResource.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UiFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UiFactory.java
index 63be709cb..63be709cb 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UiFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UiFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UiPackage.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UiPackage.java
index f54f4077d..f54f4077d 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/UiPackage.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/UiPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/WritesUI.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/WritesUI.java
index 48b58e0bd..48b58e0bd 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/WritesUI.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/WritesUI.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImageImpl.java
index b141406e3..b141406e3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImpl.java
index 6f38438a2..6f38438a2 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/DisplaysImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ManagesUIImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ManagesUIImpl.java
index 1ff5e1b26..1ff5e1b26 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ManagesUIImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ManagesUIImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReadsUIImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReadsUIImpl.java
index 77002768f..77002768f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReadsUIImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReadsUIImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReportImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReportImpl.java
index 10ae658c9..10ae658c9 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReportImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ReportImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ScreenImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ScreenImpl.java
index af33f88cf..af33f88cf 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ScreenImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/ScreenImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIActionImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIActionImpl.java
index c8a8c40a3..c8a8c40a3 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIActionImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIActionImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIDisplayImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIDisplayImpl.java
index fd37dd01f..fd37dd01f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIDisplayImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIDisplayImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIElementImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIElementImpl.java
index 866d63643..866d63643 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIEventImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIEventImpl.java
index ef00c9b89..ef00c9b89 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIEventImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIEventImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFieldImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFieldImpl.java
index 22c025303..22c025303 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFieldImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFieldImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFlowImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFlowImpl.java
index 939e445a6..939e445a6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFlowImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIFlowImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UILayoutImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UILayoutImpl.java
index 50fd105a0..50fd105a0 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UILayoutImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UILayoutImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIModelImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIModelImpl.java
index 2a5e18c7f..2a5e18c7f 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIRelationshipImpl.java
index 5e418b291..5e418b291 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIResourceImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIResourceImpl.java
index 8dcfe402c..8dcfe402c 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIResourceImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UIResourceImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiFactoryImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiFactoryImpl.java
index c34d453cc..c34d453cc 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiPackageImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiPackageImpl.java
index 5e8c278e4..5e8c278e4 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/UiPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/WritesUIImpl.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/WritesUIImpl.java
index 6ee729ab6..6ee729ab6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/impl/WritesUIImpl.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/impl/WritesUIImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiAdapterFactory.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiAdapterFactory.java
index 2da493091..2da493091 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiSwitch.java b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiSwitch.java
index 5d8b7b6a6..5d8b7b6a6 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/src/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.kdm/src-gen/org/eclipse/gmt/modisco/omg/kdm/ui/util/UiSwitch.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/.checkstyle b/org.eclipse.gmt.modisco.omg.smm/.checkstyle
index e465f6767..699104fb8 100644
--- a/org.eclipse.gmt.modisco.omg.smm/.checkstyle
+++ b/org.eclipse.gmt.modisco.omg.smm/.checkstyle
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/omg/smm"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.omg.smm/.classpath b/org.eclipse.gmt.modisco.omg.smm/.classpath
index 2d1a4302f..8aeab6132 100644
--- a/org.eclipse.gmt.modisco.omg.smm/.classpath
+++ b/org.eclipse.gmt.modisco.omg.smm/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/org.eclipse.gmt.modisco.omg.smm/build.properties b/org.eclipse.gmt.modisco.omg.smm/build.properties
index 7c6e0bea4..d6fb0928e 100644
--- a/org.eclipse.gmt.modisco.omg.smm/build.properties
+++ b/org.eclipse.gmt.modisco.omg.smm/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -7,10 +7,11 @@
 #

 # Contributors:

 #    Gabriel Barbier (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 

 # NLS_MESSAGEFORMAT_VAR

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 bin.includes = plugin.xml,\

                plugin.properties,\

diff --git a/org.eclipse.gmt.modisco.omg.smm/model/SMM.genmodel b/org.eclipse.gmt.modisco.omg.smm/model/SMM.genmodel
index 9d2d2c9b7..fc4d5a532 100644
--- a/org.eclipse.gmt.modisco.omg.smm/model/SMM.genmodel
+++ b/org.eclipse.gmt.modisco.omg.smm/model/SMM.genmodel
@@ -1,8 +1,8 @@
 <?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) 2008 Castor Technologies Inc.&#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;    Alain Picard (Castor Technologies Inc) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.gmt.modisco.smm/src" editDirectory="/org.eclipse.gmt.modisco.smm.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2008, 2018 Castor Technologies Inc. and 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;    Alain Picard (Castor Technologies Inc) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.smm/src-gen" editDirectory="/org.eclipse.gmt.modisco.smm.edit/src"

     editorDirectory="/org.eclipse.gmt.modisco.smm.editor/src" modelPluginID="org.eclipse.gmt.modisco.smm"

     modelName="SMM" editPluginClass="org.eclipse.gmt.modisco.smm.action.provider.SMMEditPlugin"

     editorPluginClass="org.eclipse.gmt.modisco.smm.action.presentation.SMMEditorPlugin"

diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Accumulator.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Accumulator.java
index 08f5e7623..08f5e7623 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Accumulator.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Accumulator.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/AggregatedMeasurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/AggregatedMeasurement.java
index afe664974..afe664974 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/AggregatedMeasurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/AggregatedMeasurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Annotation.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Annotation.java
index 44d6ebd39..44d6ebd39 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Annotation.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Annotation.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Attribute.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Attribute.java
index 0bedaa93a..0bedaa93a 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Attribute.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Attribute.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/BinaryMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/BinaryMeasure.java
index fdb37766c..fdb37766c 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/BinaryMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/BinaryMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Category.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Category.java
index 61799140a..61799140a 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Category.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Category.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/CategoryRelationship.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/CategoryRelationship.java
index d8c3030da..d8c3030da 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/CategoryRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/CategoryRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Characteristic.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Characteristic.java
index 1d8b35c3b..1d8b35c3b 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Characteristic.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Characteristic.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasure.java
index d87af244d..d87af244d 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasurement.java
index 4f140db94..4f140db94 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/CollectiveMeasurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Count.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Count.java
index b1a9c2641..b1a9c2641 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Count.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Count.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Counting.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Counting.java
index 9ac2d0181..9ac2d0181 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Counting.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Counting.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasure.java
index 3477aafc9..3477aafc9 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasurement.java
index e5bad2e65..e5bad2e65 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DimensionalMeasurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DirectMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DirectMeasure.java
index f088818a5..f088818a5 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DirectMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DirectMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DirectMeasurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DirectMeasurement.java
index 2003d7e24..2003d7e24 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/DirectMeasurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/DirectMeasurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Grade.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Grade.java
index a688eeef9..a688eeef9 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Grade.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Grade.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Measure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Measure.java
index f62de7482..f62de7482 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Measure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Measure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/MeasureRelationship.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/MeasureRelationship.java
index b6d52023a..b6d52023a 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/MeasureRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/MeasureRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Measurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Measurement.java
index 3ad33e1b6..3ad33e1b6 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Measurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Measurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/MeasurementRelationship.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/MeasurementRelationship.java
index 934d1c02e..934d1c02e 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/MeasurementRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/MeasurementRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/NamedMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/NamedMeasure.java
index fd916e842..fd916e842 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/NamedMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/NamedMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/NamedMeasurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/NamedMeasurement.java
index 5c3011688..5c3011688 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/NamedMeasurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/NamedMeasurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Observation.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Observation.java
index 52bd558b7..52bd558b7 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Observation.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Observation.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Ranking.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Ranking.java
index f4ea37af3..f4ea37af3 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Ranking.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Ranking.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/RankingInterval.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/RankingInterval.java
index 6eccf6e00..6eccf6e00 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/RankingInterval.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/RankingInterval.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/RatioMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/RatioMeasure.java
index 6c47e042f..6c47e042f 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/RatioMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/RatioMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/ReScaledMeasurement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/ReScaledMeasurement.java
index 119ddd7ee..119ddd7ee 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/ReScaledMeasurement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/ReScaledMeasurement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/RescaledMeasure.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/RescaledMeasure.java
index f5c79fc3b..f5c79fc3b 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/RescaledMeasure.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/RescaledMeasure.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Scope.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Scope.java
index c74541c59..c74541c59 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/Scope.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/Scope.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmElement.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmElement.java
index b22bfa636..b22bfa636 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmElement.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmElement.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmFactory.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmFactory.java
index 96776f07b..96776f07b 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmFactory.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmModel.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmModel.java
index ee1d1ec7e..ee1d1ec7e 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmModel.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmModel.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmPackage.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmPackage.java
index c0d8c1428..c0d8c1428 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmPackage.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmPackage.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmRelationship.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmRelationship.java
index 1207a39e5..1207a39e5 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/SmmRelationship.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/SmmRelationship.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/AggregatedMeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/AggregatedMeasurementImpl.java
index dd4184d9e..dd4184d9e 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/AggregatedMeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/AggregatedMeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/AnnotationImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/AnnotationImpl.java
index 6552be25c..6552be25c 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/AnnotationImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/AnnotationImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/AttributeImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/AttributeImpl.java
index a7a803fea..a7a803fea 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/AttributeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/AttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/BinaryMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/BinaryMeasureImpl.java
index 8cd246616..8cd246616 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/BinaryMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/BinaryMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CategoryImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CategoryImpl.java
index 625281398..625281398 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CategoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CategoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CategoryRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CategoryRelationshipImpl.java
index 44a879ebb..44a879ebb 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CategoryRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CategoryRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CharacteristicImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CharacteristicImpl.java
index 31737d1be..31737d1be 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CharacteristicImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CharacteristicImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasureImpl.java
index ef8aae2bf..ef8aae2bf 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasurementImpl.java
index 609b368f0..609b368f0 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CollectiveMeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CountImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CountImpl.java
index 5d906cab3..5d906cab3 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CountImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CountImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CountingImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CountingImpl.java
index 84c7b62e4..84c7b62e4 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/CountingImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/CountingImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasureImpl.java
index e62f69feb..e62f69feb 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasurementImpl.java
index d24f0cd6f..d24f0cd6f 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DimensionalMeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasureImpl.java
index 97824907a..97824907a 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasurementImpl.java
index a5d541ca0..a5d541ca0 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/DirectMeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/GradeImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/GradeImpl.java
index ad78a534d..ad78a534d 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/GradeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/GradeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasureImpl.java
index 9511aafe7..9511aafe7 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasureRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasureRelationshipImpl.java
index 6a09e9f03..6a09e9f03 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasureRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasureRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementImpl.java
index c27fca8e5..c27fca8e5 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementRelationshipImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementRelationshipImpl.java
index 38b40c587..38b40c587 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementRelationshipImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/MeasurementRelationshipImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasureImpl.java
index fe869ddf8..fe869ddf8 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasurementImpl.java
index a6d248623..a6d248623 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/NamedMeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/ObservationImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/ObservationImpl.java
index 7a9207204..7a9207204 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/ObservationImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/ObservationImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RankingImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RankingImpl.java
index 4d4d557d2..4d4d557d2 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RankingImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RankingImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RankingIntervalImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RankingIntervalImpl.java
index f0d286605..f0d286605 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RankingIntervalImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RankingIntervalImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RatioMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RatioMeasureImpl.java
index 90bdbb159..90bdbb159 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RatioMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RatioMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/ReScaledMeasurementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/ReScaledMeasurementImpl.java
index 46ffdb3e2..46ffdb3e2 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/ReScaledMeasurementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/ReScaledMeasurementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RescaledMeasureImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RescaledMeasureImpl.java
index 40bdb50c4..40bdb50c4 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/RescaledMeasureImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/RescaledMeasureImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/ScopeImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/ScopeImpl.java
index db8a0f3d2..db8a0f3d2 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/ScopeImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/ScopeImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmElementImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmElementImpl.java
index 92bd9483f..92bd9483f 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmElementImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmElementImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmFactoryImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmFactoryImpl.java
index 76400abb3..76400abb3 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmModelImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmModelImpl.java
index 5c8983239..5c8983239 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmModelImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmModelImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmPackageImpl.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmPackageImpl.java
index a66c46fe2..a66c46fe2 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/impl/SmmPackageImpl.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/impl/SmmPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/util/SmmAdapterFactory.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/util/SmmAdapterFactory.java
index 10ff56fa6..10ff56fa6 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/util/SmmAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/util/SmmAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/util/SmmSwitch.java b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/util/SmmSwitch.java
index d5cac5715..d5cac5715 100644
--- a/org.eclipse.gmt.modisco.omg.smm/src/org/eclipse/gmt/modisco/omg/smm/util/SmmSwitch.java
+++ b/org.eclipse.gmt.modisco.omg.smm/src-gen/org/eclipse/gmt/modisco/omg/smm/util/SmmSwitch.java
diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/.checkstyle b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/.checkstyle
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/ComputeInvocationOrder.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/ComputeInvocationOrder.java
index a1799a005..40e44a5bd 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/ComputeInvocationOrder.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/ComputeInvocationOrder.java
@@ -39,7 +39,7 @@ public class ComputeInvocationOrder implements
 		}

 		return result;

 	}

-	

+

 	private final int computeIndex(final EObject element, final Block rootBlock) {

 		int result = ComputeInvocationOrder.DEFAULT_INDEX;

 		if (element.eContainer() == rootBlock) {

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllPotentialTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllPotentialTypes.java
index d0871bca4..2cdf2da64 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllPotentialTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllPotentialTypes.java
@@ -33,7 +33,7 @@ import org.eclipse.gmt.modisco.java.VariableDeclarationFragment;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class GetAllPotentialTypes implements

 		IJavaModelQuery<VariableDeclaration, EList<Type>> {

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllSubTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllSubTypes.java
index 7e2def77f..b5cd92832 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllSubTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetAllSubTypes.java
@@ -29,7 +29,7 @@ import org.eclipse.gmt.modisco.java.TypeAccess;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class GetAllSubTypes implements IJavaModelQuery<Type, EList<Type>> {

 

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetCalledMethods.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetCalledMethods.java
index a93041e04..a641036ce 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetCalledMethods.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetCalledMethods.java
@@ -49,7 +49,7 @@ public class GetCalledMethods
 		}

 		return result;

 	}

-	

+

 	private final AbstractMethodDeclaration getInvoker(final EObject element) {

 		AbstractMethodDeclaration result = null;

 		if (element != null) {

@@ -61,7 +61,7 @@ public class GetCalledMethods
 		}

 		return result;

 	}

-	

+

 	private static class MethodInvocationComparator implements Comparator<AbstractMethodInvocation>  {

 

 		private static final int DEFAULT_INDEX = -2;

@@ -76,7 +76,7 @@ public class GetCalledMethods
 			 * Initially, I used location in file

 			 * to sort invocations, but needed information

 			 * is no longer retained in java model ...

-			 * 

+			 *

 			 * Perhpas could I use index of parent element

 			 * which is directly contained in block statement

 			 * of the declaring method ?

@@ -89,7 +89,7 @@ public class GetCalledMethods
 			 * specific case:

 			 * both invocations have the same index

 			 * and are contained in the same block.

-			 * 

+			 *

 			 * So we have to retrieve first common parent block

 			 * and use it to compute index ...

 			 */

@@ -98,11 +98,11 @@ public class GetCalledMethods
 				index1 = this.computeIndex(invocation1, commonBlock);

 				index2 = this.computeIndex(invocation2, commonBlock);

 			}

-			

+

 			int result = Integer.valueOf(index1).compareTo(Integer.valueOf(index2));

 			return result;

 		}

-		

+

 		private final int computeIndex(final EObject element, final Block rootBlock) {

 			int result = MethodInvocationComparator.DEFAULT_INDEX;

 			if (element.eContainer() == rootBlock) {

@@ -112,7 +112,7 @@ public class GetCalledMethods
 			}

 			return result;

 		}

-		

+

 		private final Block getRootBlock(final EObject element) {

 			Block result = null;

 			if (element != null) {

@@ -129,7 +129,7 @@ public class GetCalledMethods
 		 * lets start from an example:

 		 * block A contains another block B (with other statements)

 		 * block B contains two blocks C and D which contains respectively element1 and element2

-		 * 

+		 *

 		 * Here the algorithm:

 		 * From element1, I get the nearest parent block

 		 * Then I will iterate on all parent blocks of element2 and test identity

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetFilteredPotentialTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetFilteredPotentialTypes.java
index f664ebca1..f235ef59c 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetFilteredPotentialTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetFilteredPotentialTypes.java
@@ -30,18 +30,18 @@ import org.eclipse.gmt.modisco.java.VariableDeclaration;
  */

 public class GetFilteredPotentialTypes implements

 		IJavaModelQuery<VariableDeclaration, EList<Type>> {

-	

+

 	public EList<Type> getFilteredPotentialTypes(final VariableDeclaration source) {

 		EList<VariableDeclaration> parents = new BasicEList<VariableDeclaration>();

-		EList<Type> result = this.getBasicFilteredPotentialTypes(source, parents);	

+		EList<Type> result = this.getBasicFilteredPotentialTypes(source, parents);

 		return result;

 	}

-	

+

 	private final EList<Type> getBasicFilteredPotentialTypes(final VariableDeclaration source, final EList<VariableDeclaration> parents) {

 		EList<Type> result = new BasicEList<Type>();

 		if (!parents.contains(source)) {

 			parents.add(source);

-		

+

 			Expression initializer = source.getInitializer();

 			if ((initializer != null) && (initializer instanceof ClassInstanceCreation)) {

 				ClassInstanceCreation classInstanceCreation = (ClassInstanceCreation) initializer;

@@ -64,7 +64,7 @@ public class GetFilteredPotentialTypes implements
 				} else if (expression instanceof SingleVariableAccess) {

 					/*

 					 * potential infinite recursion

-					 * 

+					 *

 					 * Object tmp;

 					 * Object src = tmp;

 					 * ...

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubMethods.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubMethods.java
index bdb8780a3..81b89c132 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubMethods.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubMethods.java
@@ -30,7 +30,7 @@ import org.eclipse.gmt.modisco.java.UnresolvedMethodDeclaration;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class GetSubMethods

 		implements

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubTypes.java
index 0a0d54b27..91cd78fdb 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetSubTypes.java
@@ -29,7 +29,7 @@ import org.eclipse.gmt.modisco.java.TypeAccess;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class GetSubTypes implements IJavaModelQuery<Type, EList<Type>> {

 

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedPackages.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedPackages.java
index 8db70724f..bd56ec832 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedPackages.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedPackages.java
@@ -26,7 +26,7 @@ import org.eclipse.gmt.modisco.java.Type;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class GetUsedPackages implements

 		IJavaModelQuery<Package, EList<Package>> {

@@ -80,9 +80,9 @@ public class GetUsedPackages implements
 	/**

 	 * We should filter used packages to keep only first common parent package.

 	 * example: initial list of used packages = a.b.c, a.b.d, e.f, e.g

-	 * 

+	 *

 	 * final list of used packages = a.b, e

-	 * 

+	 *

 	 * @param usedPackages

 	 * @return a collection of common packages

 	 */

@@ -104,7 +104,7 @@ public class GetUsedPackages implements
 	 * packages which have no common hierarchy don't have to be compared. For

 	 * example, if we have two packages a.b and c.d, then result will be a.b But

 	 * if we have three packages a.b, a.c and d.e, then result will be a

-	 * 

+	 *

 	 * @param usedPackage

 	 * @param usedPackages

 	 * @return the package which is common of both packages, usedPackage

@@ -135,7 +135,7 @@ public class GetUsedPackages implements
 	}

 

 	/**

-	 * 

+	 *

 	 * @param usedPackage

 	 * @param otherPackage

 	 * @return the package which is common of both packages, null otherwise

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedTypes.java
index c584c4424..a55d8d9dd 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/GetUsedTypes.java
@@ -47,7 +47,7 @@ public class GetUsedTypes implements IJavaModelQuery<Type, EList<Type>> {
 		}

 		return result;

 	}

-	

+

 	private final Type getContainerType(final EObject source) {

 		Type result = null;

 		if (source.eContainer() instanceof Type) {

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasFilteredPotentialTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasFilteredPotentialTypes.java
index b552a8bf8..d59198093 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasFilteredPotentialTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasFilteredPotentialTypes.java
@@ -19,7 +19,7 @@ import org.eclipse.gmt.modisco.java.VariableDeclaration;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class HasFilteredPotentialTypes implements

 		IJavaModelQuery<VariableDeclaration, Boolean> {

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasMainMethod.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasMainMethod.java
index a40db0337..bbae1e6a1 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasMainMethod.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasMainMethod.java
@@ -20,7 +20,7 @@ import org.eclipse.gmt.modisco.java.MethodDeclaration;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class HasMainMethod implements IJavaModelQuery<ClassDeclaration, Boolean> {

 

diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasUsedTypes.java b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasUsedTypes.java
index 579dd05d0..d1b2967a4 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasUsedTypes.java
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/src/org/eclipse/gmt/modisco/examples/modelplex/custom/HasUsedTypes.java
@@ -19,7 +19,7 @@ import org.eclipse.gmt.modisco.java.Type;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class HasUsedTypes implements IJavaModelQuery<Type, Boolean> {

 

diff --git a/org.eclipse.gmt.modisco.xml/.checkstyle b/org.eclipse.gmt.modisco.xml/.checkstyle
index 41529231f..699104fb8 100644
--- a/org.eclipse.gmt.modisco.xml/.checkstyle
+++ b/org.eclipse.gmt.modisco.xml/.checkstyle
@@ -1,15 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/xml"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/xml/emf"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/xml/emf/impl"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/xml/emf/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.gmt.modisco.xml/.classpath b/org.eclipse.gmt.modisco.xml/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.gmt.modisco.xml/.classpath
+++ b/org.eclipse.gmt.modisco.xml/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.gmt.modisco.xml/build.properties b/org.eclipse.gmt.modisco.xml/build.properties
index 3c5f7bb00..913e30705 100644
--- a/org.eclipse.gmt.modisco.xml/build.properties
+++ b/org.eclipse.gmt.modisco.xml/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Fabien Giquel (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                model/,\

@@ -19,6 +20,6 @@ bin.includes = .,\
                about.properties,\

                modeling32.png

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.gmt.modisco.xml/model/xml.genmodel b/org.eclipse.gmt.modisco.xml/model/xml.genmodel
index 6181879cb..87c7c926d 100644
--- a/org.eclipse.gmt.modisco.xml/model/xml.genmodel
+++ b/org.eclipse.gmt.modisco.xml/model/xml.genmodel
@@ -1,8 +1,8 @@
 <?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;&#xD;&#xA;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.gmt.modisco.xml/src" modelPluginID="org.eclipse.gmt.modisco.xml"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2009, 2018 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.gmt.modisco.xml/src-gen" modelPluginID="org.eclipse.gmt.modisco.xml"

     modelName="Xml" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false">

   <foreignModel>xml.ecore</foreignModel>

diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Attribute.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Attribute.java
index a19347eeb..a19347eeb 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Attribute.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Attribute.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/CDATA.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/CDATA.java
index 0b94526a9..0b94526a9 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/CDATA.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/CDATA.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Comment.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Comment.java
index 2fcf4f67b..2fcf4f67b 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Comment.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Comment.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/DocumentTypeDeclaration.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/DocumentTypeDeclaration.java
index c4c829098..c4c829098 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/DocumentTypeDeclaration.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/DocumentTypeDeclaration.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Element.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Element.java
index 3a569e7a0..3a569e7a0 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Element.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Element.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Namespace.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Namespace.java
index ea4c3ccf6..ea4c3ccf6 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Namespace.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Namespace.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Node.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Node.java
index 019654351..019654351 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Node.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Node.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/ProcessingInstruction.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/ProcessingInstruction.java
index c5ff0de1c..c5ff0de1c 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/ProcessingInstruction.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/ProcessingInstruction.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Root.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Root.java
index 11db9aabd..11db9aabd 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Root.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Root.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Text.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Text.java
index 7e23035a8..7e23035a8 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/Text.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/Text.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLFactory.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLFactory.java
index 32330d4c6..32330d4c6 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLFactory.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLFactory.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLPackage.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLPackage.java
index 13b20a1bd..13b20a1bd 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLPackage.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/MoDiscoXMLPackage.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/AttributeImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/AttributeImpl.java
index 120641aef..120641aef 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/AttributeImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/AttributeImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/CDATAImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/CDATAImpl.java
index 5c9c30f7e..5c9c30f7e 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/CDATAImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/CDATAImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/CommentImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/CommentImpl.java
index 550a92cf9..550a92cf9 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/CommentImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/CommentImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/DocumentTypeDeclarationImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/DocumentTypeDeclarationImpl.java
index c3f02c816..c3f02c816 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/DocumentTypeDeclarationImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/DocumentTypeDeclarationImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/ElementImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/ElementImpl.java
index 871671057..871671057 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/ElementImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/ElementImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLFactoryImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLFactoryImpl.java
index d5f329840..d5f329840 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLPackageImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLPackageImpl.java
index ffed9e196..ffed9e196 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLPackageImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/MoDiscoXMLPackageImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/NamespaceImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/NamespaceImpl.java
index 06cbd4ee2..06cbd4ee2 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/NamespaceImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/NamespaceImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/NodeImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/NodeImpl.java
index 0e3215390..0e3215390 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/NodeImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/NodeImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/ProcessingInstructionImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/ProcessingInstructionImpl.java
index d99e82ce1..d99e82ce1 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/ProcessingInstructionImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/ProcessingInstructionImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/RootImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/RootImpl.java
index b9e7417e7..b9e7417e7 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/RootImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/RootImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/TextImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/TextImpl.java
index bd56ed543..bd56ed543 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/impl/TextImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/impl/TextImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLAdapterFactory.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLAdapterFactory.java
index 7edfeeafc..7edfeeafc 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLAdapterFactory.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLAdapterFactory.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLSwitch.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLSwitch.java
index d81fd68e2..d81fd68e2 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLSwitch.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/emf/util/MoDiscoXMLSwitch.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLHandler.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLHandler.java
index 26106ab46..26106ab46 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLHandler.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLHandler.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLWriter.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLWriter.java
index 6cbf9c7a3..6cbf9c7a3 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLWriter.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/internal/resource/GenericXMLWriter.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/plugin/XmlActivator.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/plugin/XmlActivator.java
index 6f95b2433..6f95b2433 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/plugin/XmlActivator.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/plugin/XmlActivator.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceFactoryImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceFactoryImpl.java
index 1f918b2a5..1f918b2a5 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceFactoryImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceFactoryImpl.java
diff --git a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceImpl.java b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceImpl.java
index 9081383aa..9081383aa 100644
--- a/org.eclipse.gmt.modisco.xml/src/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceImpl.java
+++ b/org.eclipse.gmt.modisco.xml/src-gen/org/eclipse/gmt/modisco/xml/resource/GenericXMLResourceImpl.java
diff --git a/org.eclipse.modisco.common.tests/.checkstyle b/org.eclipse.modisco.common.tests/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.common.tests/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java b/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java
index 29ecd43c4..78b2d3341 100644
--- a/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java
+++ b/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/TestModelUtils.java b/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/TestModelUtils.java
index c8b399206..824c8e20f 100644
--- a/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/TestModelUtils.java
+++ b/org.eclipse.modisco.common.tests/src/org/eclipse/modisco/common/tests/TestModelUtils.java
@@ -20,7 +20,7 @@ import org.eclipse.gmt.modisco.infra.common.core.internal.utils.ModelUtils;
 public class TestModelUtils {

 	/**

 	 * Compare two ecore files as models.

-	 * 

+	 *

 	 * @param leftUri

 	 *            the left file uri

 	 * @param rightUri

@@ -48,7 +48,7 @@ public class TestModelUtils {
 

 	/**

 	 * Compare two ecore files as models.

-	 * 

+	 *

 	 * @param leftUri

 	 *            the left file uri

 	 * @param rightUri

@@ -63,7 +63,7 @@ public class TestModelUtils {
 	public static boolean compareModels(final Resource leftModel, final Resource rightModel,

 			final boolean ignoreIds) throws IOException, InterruptedException {

 		throw new UnsupportedOperationException("Must be rewritten with EMF Compare 2.0");

-//		

+//

 //		boolean result = true;

 //

 //		Map<String, Object> options = new HashMap<String, Object>();

@@ -87,7 +87,7 @@ public class TestModelUtils {
 

 //	/**

 //	 * Saves a model as a file to the given uri.

-//	 * 

+//	 *

 //	 * @param root

 //	 *            Root of the objects to be serialized in a file.

 //	 * @param path

diff --git a/org.eclipse.modisco.doc/src/org/eclipse/modisco/doc/internal/Activator.java b/org.eclipse.modisco.doc/src/org/eclipse/modisco/doc/internal/Activator.java
index 1380c3e45..de780864e 100644
--- a/org.eclipse.modisco.doc/src/org/eclipse/modisco/doc/internal/Activator.java
+++ b/org.eclipse.modisco.doc/src/org/eclipse/modisco/doc/internal/Activator.java
@@ -26,7 +26,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.eclipseplugin.discoverer/.checkstyle b/org.eclipse.modisco.eclipseplugin.discoverer/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer/.checkstyle
+++ b/org.eclipse.modisco.eclipseplugin.discoverer/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java b/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java
index d302c8f5a..879d8de1d 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java
+++ b/org.eclipse.modisco.eclipseplugin.discoverer/src/org/eclipse/modisco/eclipseplugin/discoverer/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.eclipseplugin/.checkstyle b/org.eclipse.modisco.eclipseplugin/.checkstyle
new file mode 100644
index 000000000..5275553d5
--- /dev/null
+++ b/org.eclipse.modisco.eclipseplugin/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/org/eclipse/modisco/eclipseplugin"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.eclipseplugin/.classpath b/org.eclipse.modisco.eclipseplugin/.classpath
index efdacce14..093895c1b 100644
--- a/org.eclipse.modisco.eclipseplugin/.classpath
+++ b/org.eclipse.modisco.eclipseplugin/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.eclipseplugin/build.properties b/org.eclipse.modisco.eclipseplugin/build.properties
index 908c88ff1..42a02432f 100644
--- a/org.eclipse.modisco.eclipseplugin/build.properties
+++ b/org.eclipse.modisco.eclipseplugin/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Frederic Madiot (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 

 bin.includes = .,\

@@ -16,6 +17,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.eclipseplugin/model/EclipsePlugin.genmodel b/org.eclipse.modisco.eclipseplugin/model/EclipsePlugin.genmodel
index 959f73e2f..a0ebc9d10 100644
--- a/org.eclipse.modisco.eclipseplugin/model/EclipsePlugin.genmodel
+++ b/org.eclipse.modisco.eclipseplugin/model/EclipsePlugin.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2010 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;    Frederic Madiot (Mia-Software) - metamodel design and initial implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.modisco.eclipseplugin/src" modelPluginID="org.eclipse.modisco.eclipseplugin"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;    Frederic Madiot (Mia-Software) - metamodel design and initial implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.modisco.eclipseplugin/src-gen" modelPluginID="org.eclipse.modisco.eclipseplugin"

     modelName="EclipsePlugin" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.gmt.modisco.java/model/java.genmodel#//java platform:/plugin/org.eclipse.gmt.modisco.omg.kdm/model/kdm.genmodel#//kdm platform:/plugin/org.eclipse.modisco.manifest/model/Manifest.genmodel#//manifest platform:/plugin/org.eclipse.gmt.modisco.xml/model/xml.genmodel#//xml">

   <foreignModel>EclipsePlugin.ecore</foreignModel>

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/EclipsePlugin.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/EclipsePlugin.java
index 2378b6aca..feefb9784 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/EclipsePlugin.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/EclipsePlugin.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin;

 

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/EclipsepluginFactory.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/EclipsepluginFactory.java
index b2c1fd958..3b51f56ab 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/EclipsepluginFactory.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/EclipsepluginFactory.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin;

 

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/EclipsepluginPackage.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/EclipsepluginPackage.java
index 7e08470a4..e0f1310a1 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/EclipsepluginPackage.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/EclipsepluginPackage.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin;

 

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/impl/EclipsePluginImpl.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/impl/EclipsePluginImpl.java
index 20806f468..373271864 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/impl/EclipsePluginImpl.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/impl/EclipsePluginImpl.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin.impl;

 

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginFactoryImpl.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginFactoryImpl.java
index 04eddba9d..e8063b130 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginFactoryImpl.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginFactoryImpl.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin.impl;

 

@@ -36,7 +36,7 @@ public class EclipsepluginFactoryImpl extends EFactoryImpl implements Eclipseplu
 	 */

 	public static EclipsepluginFactory init() {

 		try {

-			EclipsepluginFactory theEclipsepluginFactory = (EclipsepluginFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/MoDisco/eclipseplugin"); 

+			EclipsepluginFactory theEclipsepluginFactory = (EclipsepluginFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/MoDisco/eclipseplugin");

 			if (theEclipsepluginFactory != null) {

 				return theEclipsepluginFactory;

 			}

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginPackageImpl.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginPackageImpl.java
index 54f50c6a0..9e3b3b88b 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginPackageImpl.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/impl/EclipsepluginPackageImpl.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin.impl;

 

@@ -94,7 +94,7 @@ public class EclipsepluginPackageImpl extends EPackageImpl implements Eclipseplu
 

 	/**

 	 * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-	 * 

+	 *

 	 * <p>This method is used to initialize {@link EclipsepluginPackage#eINSTANCE} when that field is accessed.

 	 * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

 	 * <!-- begin-user-doc -->

@@ -138,7 +138,7 @@ public class EclipsepluginPackageImpl extends EPackageImpl implements Eclipseplu
 		// Mark meta-data to indicate it can't be changed

 		theEclipsepluginPackage.freeze();

 

-  

+

 		// Update the registry and return the package

 		EPackage.Registry.INSTANCE.put(EclipsepluginPackage.eNS_URI, theEclipsepluginPackage);

 		return theEclipsepluginPackage;

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/util/EclipsepluginAdapterFactory.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/util/EclipsepluginAdapterFactory.java
index 46133bb5e..c1706d321 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/util/EclipsepluginAdapterFactory.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/util/EclipsepluginAdapterFactory.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin.util;

 

diff --git a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/util/EclipsepluginSwitch.java b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/util/EclipsepluginSwitch.java
index 262b8a18a..6b98e4869 100644
--- a/org.eclipse.modisco.eclipseplugin/src/org/eclipse/modisco/eclipseplugin/util/EclipsepluginSwitch.java
+++ b/org.eclipse.modisco.eclipseplugin/src-gen/org/eclipse/modisco/eclipseplugin/util/EclipsepluginSwitch.java
@@ -4,10 +4,10 @@
  * 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:

  *     Frederic Madiot (Mia-Software) - metamodel design and initial implementation

- * 

+ *

  */

 package org.eclipse.modisco.eclipseplugin.util;

 

diff --git a/org.eclipse.modisco.infra.browser.custom.examples.generation/.checkstyle b/org.eclipse.modisco.infra.browser.custom.examples.generation/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.custom.examples.generation/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.generation/src/org/eclipse/modisco/infra/browser/custom/examples/generation/Activator.java b/org.eclipse.modisco.infra.browser.custom.examples.generation/src/org/eclipse/modisco/infra/browser/custom/examples/generation/Activator.java
index b3bcb7e0a..b197006c6 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.generation/src/org/eclipse/modisco/infra/browser/custom/examples/generation/Activator.java
+++ b/org.eclipse.modisco.infra.browser.custom.examples.generation/src/org/eclipse/modisco/infra/browser/custom/examples/generation/Activator.java
@@ -33,7 +33,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -46,7 +46,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -59,7 +59,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/.checkstyle b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/.checkstyle
+++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java
index fe4193d2c..ad1a3d7d7 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java
+++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/*

 	 * (non-Javadoc)

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Tests.java b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Tests.java
index 8b9637d6b..55013e0f5 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Tests.java
+++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/src/org/eclipse/modisco/infra/browser/custom/examples/java/jdk/tests/Tests.java
@@ -37,7 +37,7 @@ import org.junit.Test;
 

 /**

  * @author Gregoire DUPE

- * 

+ *

  */

 public class Tests {

 

@@ -48,7 +48,7 @@ public class Tests {
 		URI uri = URI.createURI(Tests.PLUGIN_URI + "/_example_EMFHighlight.uiCustom"); //$NON-NLS-1$

 		FileUtils.checkEMFResource(uri, 1);

 	}

-	

+

 	@Test

 	public void jdkAndEclipseFacets() throws Exception {

 		URI uri = URI.createURI(Tests.PLUGIN_URI

@@ -59,7 +59,7 @@ public class Tests {
 		Assert.assertNotNull(facetSet);

 	}

 

-	

+

 	@Test

 	public void jdkAndEclipseFacetsCustomization() throws Exception {

 		URI uri = URI.createURI(Tests.PLUGIN_URI

diff --git a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/.checkstyle b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/.checkstyle
+++ b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Tests.java b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Tests.java
index 8114caf30..af16e26e8 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Tests.java
+++ b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/src/org/eclipse/modisco/infra/browser/custom/examples/uml/tests/Tests.java
@@ -54,7 +54,7 @@ import org.junit.Test;
 

 /**

  * @author Gregoire DUPE

- * 

+ *

  */

 @SuppressWarnings({ "boxing", "nls" })

 public class Tests {

diff --git a/org.eclipse.modisco.infra.browser.custom.tests/.checkstyle b/org.eclipse.modisco.infra.browser.custom.tests/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.modisco.infra.browser.custom.tests/.checkstyle
+++ b/org.eclipse.modisco.infra.browser.custom.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java b/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java
index d77274c23..73446f1be 100644
--- a/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java
+++ b/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/Activator.java
@@ -14,7 +14,7 @@ import org.eclipse.core.runtime.Plugin;
 import org.osgi.framework.BundleContext;

 

 /**

- * 

+ *

  * @author Gregoire DUPE (Mia-Software)

  * @deprecated Will become internal cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=470609

  */

@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
 public class Activator extends Plugin {

 

 	private static Activator plugin;

-	

+

 	@Override

 	public void start(final BundleContext context) throws Exception {

 		super.start(context);

diff --git a/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/BrowserCustomTest.java b/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/BrowserCustomTest.java
index a4ddb121e..de56580a6 100644
--- a/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/BrowserCustomTest.java
+++ b/org.eclipse.modisco.infra.browser.custom.tests/src/org/eclipse/modisco/infra/browser/custom/tests/BrowserCustomTest.java
@@ -124,7 +124,7 @@ public class BrowserCustomTest {
 		/*

 		 * Color typeColorFalse = customizationEngine.getTypeColor(classFalse);

 		 * Assert.assertTrue(typeColorFalse == null);

-		 * 

+		 *

 		 * final Color typeColorTrue =

 		 * customizationEngine.getTypeColor(classTrue);

 		 * Assert.assertTrue(typeColorTrue != null);

@@ -553,7 +553,7 @@ public class BrowserCustomTest {
 				"The element should appear directly in its own children with 'collapse links' on a FacetReference with the 'identity' query",

 				foundSelf);

 	}

-	

+

 	/** Bug 341222 - customization on feature defined in another metamodel */

 	@Test

 	public void bug341222() throws Exception {

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle b/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle
index e25b71209..f36b9a4d0 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle
+++ b/org.eclipse.modisco.infra.browser.ecore.core/.checkstyle
@@ -10,7 +10,7 @@ Contributors:
     Nicolas Bros (Mia-Software) - initial API and implementation

 -->

 <fileset-config file-format-version="1.2.0" simple-config="true">

-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">

     <file-match-pattern match-pattern="." include-pattern="true"/>

     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java
index 6c26aff0c..9672e33ac 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/Activator.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2014 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:

  *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java
index 657f23b2f..542323a48 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/epackagecontainseclass/ChildrenQuery.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * Copyright (c) 2014 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:
  *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
  */
@@ -22,7 +22,7 @@ import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
 import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
 
 public class ChildrenQuery implements IJavaQuery2<EPackage, List<EStructuralFeature>> {
-	public List<EStructuralFeature> evaluate(final EPackage context, 
+	public List<EStructuralFeature> evaluate(final EPackage context,
 			final IParameterValueList2 parameterValues,
 			final IFacetManager facetManager)
 			throws DerivedTypedElementException {
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java
index b51940000..906709109 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * Copyright (c) 2015 Soft-Maint.
  * 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:
  *    Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
  */
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java
index 10a640eb1..9960478b8 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * Copyright (c) 2015 Soft-Maint.
  * 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:
  *    Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
  */
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle b/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle
index c8d303235..7f09ed33e 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle
@@ -11,7 +11,7 @@ Contributors:
 -->
 <fileset-config file-format-version="1.2.0" simple-config="true">
   <local-check-config name="EmfFacet"
-    location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle"
+    location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle"
     type="project"
     description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java
index 0b8acec37..fd790776d 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java
index df654a74f..d723468dd 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint, and 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$

-	

+

 	public static String EcoreInstancesExplorerComposite_Instances;

 	public static String EcoreMetaExplorerComposite_Metas;

 	public static String EcoreExplorerShortcutUtils_NbInstancesEClassByResource;

@@ -23,7 +23,7 @@ public class Messages extends NLS {
 	public static String EcoreExplorerShortcutUtils_EClassFromEPackage;

 	public static String EcoreExplorerShortcutUtils_EClassSubclasses;

 	public static String EcoreExplorerShortcutUtils_EClassHierarchy;

-	

+

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(Messages.BUNDLE_NAME, Messages.class);

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java
index 1ee2146f8..9301ee7e3 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java
index dfd1e5708..b4ee94f12 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471447 - [New Browser] Add a customization counting instances by EClass

  *    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java
index 93dd65f15..491d63641 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint, and 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
  *    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource

@@ -26,9 +26,9 @@ import org.eclipse.emf.ecore.EObject;
 public interface IEcoreExplorerWidget extends IAdaptable {

 

 	void changeInput(Collection<EObject> eObjects);

-	

+

 	Set<EObject> getInstancesOfFromCurrentResources(EClass eClass);

 

 	Set<EObject> getInstancesOfFromCurrentResourceSets(EClass eClass);

-	

+

 }

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java
index cd2da1ffc..91b44e84c 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint, and 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  *    Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View

@@ -30,5 +30,5 @@ public interface IEcoreExplorerWidgetFactory {
 	IEcoreExplorerWidget createWidget(Composite parent);

 

 	IEcoreExplorerWidget createWidget(Composite parent, MenuManager menuManager);

-	

+

 }

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java
index 4d5de7d7c..5fccc340e 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint, and 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  *    Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View

@@ -20,5 +20,5 @@ package org.eclipse.modisco.infra.browser.ecore.ui.internal.exported;
 public interface IView<W extends Object> {

 

 	W getWidget();

-	

+

 }
\ No newline at end of file
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java
index 1aa927fe9..2fb4016ec 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java
index d0e1bc6bd..94e0bc509 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java
index d6afb37cd..32020e464 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java
@@ -1,10 +1,10 @@
-/** 
+/**
  * Copyright (c) 2015 Soft-Maint
  * 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:
  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
  *    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
@@ -32,7 +32,7 @@ public class SynchronizedEcoreExplorerWidget extends SynchronizedObject<org.ecli
 			}
 		});
 	}
-	
+
 	public final void changeInput(final java.util.Collection<org.eclipse.emf.ecore.EObject> parm0) {
 		voidExceptionFreeRunnable(new AbstractVoidExceptionFreeRunnable() {
 			@Override
@@ -41,7 +41,7 @@ public class SynchronizedEcoreExplorerWidget extends SynchronizedObject<org.ecli
 			}
 		});
 	}
-	
+
 	public final java.util.Set<org.eclipse.emf.ecore.EObject> getInstancesOfFromCurrentResourceSets(final org.eclipse.emf.ecore.EClass parm0) {
 		return safeSyncExec(new AbstractExceptionFreeRunnable<java.util.Set<org.eclipse.emf.ecore.EObject>>() {
 			@Override
@@ -50,7 +50,7 @@ public class SynchronizedEcoreExplorerWidget extends SynchronizedObject<org.ecli
 			}
 		});
 	}
-	
+
 	public final java.util.Set<org.eclipse.emf.ecore.EObject> getInstancesOfFromCurrentResources(final org.eclipse.emf.ecore.EClass parm0) {
 		return safeSyncExec(new AbstractExceptionFreeRunnable<java.util.Set<org.eclipse.emf.ecore.EObject>>() {
 			@Override
@@ -59,5 +59,5 @@ public class SynchronizedEcoreExplorerWidget extends SynchronizedObject<org.ecli
 			}
 		});
 	}
-	
+
 }
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java
index a363f1b83..5ddc01bf9 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Mia-Software, and Soft-Maint

  * 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:

  *    Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

@@ -38,9 +38,9 @@ public class EcoreExplorerView extends ViewPart implements
 		IView<IEcoreExplorerWidget> {

 

 	private IEcoreExplorerWidget widget;

-	

+

 	private final EcoreExplorerWindowListener wListener;

-	

+

 	private final ISelectionListener selectionListener = new ISelectionListener() {

 		public void selectionChanged(final IWorkbenchPart part,

 				final ISelection selection) {

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java
index 4090082d9..4068386c5 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Mia-Software, and Soft-Maint

  * 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:

  *    Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

@@ -105,7 +105,7 @@ public class EcoreExplorerWindowListener implements IPageListener,
 			final ISelectionProvider selectionProvider = editorSite.getSelectionProvider();

 			final ISelection selection = selectionProvider.getSelection();

 			if (!this.view.changeInput(selection)) {

-				final IEditingDomainProvider edProvider = (IEditingDomainProvider) part 

+				final IEditingDomainProvider edProvider = (IEditingDomainProvider) part

 					.getAdapter(IEditingDomainProvider.class);

 				final EditingDomain editingDomain = edProvider

 						.getEditingDomain();

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java
index 6ed19e8d2..839b31c05 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Mia-Software, and Soft-Maint

  * 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:

  *    Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

@@ -33,7 +33,7 @@ public final class Utils {
 		}

 		return result;

 	}

-	

+

 	public static EPackage getEPackage(final Object object) {

 		EPackage result = null;

 		if (object instanceof EObject) {

@@ -59,7 +59,7 @@ public final class Utils {
 		}

 		return result;

 	}

-	

+

 	public static EObject getResolvedEObject(final EObject eObject) {

 		EObject resolvedEObject = eObject;

 		if (eObject instanceof EObjectTreeElement) {

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java
index 4b23598be..7bdec5eb4 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java
index f6ce7366a..825267fbe 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java
index c2b837074..4b2ea8c0d 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource

@@ -66,7 +66,7 @@ public class EcoreExplorerWidget implements IEcoreExplorerWidget {
 		}

 		return allInstances;

 	}

-	

+

 

 	public Set<EObject> getInstancesOfFromCurrentResourceSets(

 			final EClass eClass) {

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java
index 8998e583a..926870d45 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint, and 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

@@ -44,7 +44,7 @@ import org.eclipse.swt.widgets.Listener;
 public class EcoreExplorerWidgetComposite extends Composite implements

 		ISelectionProvider, ICustomizationManagerProvider2,

 		IFacetManagerProvider2 {

-	

+

 	interface IEClassSelectionListener {

 		void onEClassSelected(Set<EClass> eClasses);

 	}

@@ -87,13 +87,13 @@ public class EcoreExplorerWidgetComposite extends Composite implements
 						setLastSelection(metaSelection);

 					}

 				});

-		

+

 		addListener(SWT.Resize, new Listener() {

 			public void handleEvent(final Event event) {

 				updateSashOrientation();

 			}

 		});

-		

+

 		final ResourceSet customRS = getCustomizationManager().getResourceSet();

 		this.customShortcuts = EcoreExplorerShortcutUtils

 				.getCustomShortcuts(customRS);

@@ -102,15 +102,15 @@ public class EcoreExplorerWidgetComposite extends Composite implements
 		this.facetSetShortcuts = EcoreExplorerShortcutUtils

 				.getFacetSetShortcuts(facetSetRS);

 	}

-	

+

 	protected ISelection getMetaSelection() {

 		return this.metaComposite.getSelection();

 	}

-	

+

 	protected ISelection getInstanceSelection() {

 		return this.instComposite.getSelection();

 	}

-	

+

 	protected void setLastSelection(final ISelection selection) {

 		this.lastSelection = selection;

 	}

@@ -151,7 +151,7 @@ public class EcoreExplorerWidgetComposite extends Composite implements
 	public IFacetManager getFacetManager() {

 		return this.metaComposite.getFacetManager();

 	}

-	

+

 	public List<IFacetSetShortcut> getFacetSetShortcuts() {

 		return Collections.unmodifiableList(this.facetSetShortcuts);

 	}

@@ -184,16 +184,16 @@ public class EcoreExplorerWidgetComposite extends Composite implements
 	public void addEClassSelectionListener(final IEClassSelectionListener listener) {

 		this.listeners.add(listener);

 	}

-	

+

 	private void notifyEClassSelected(final Set<EClass> eClasses) {

 		for (IEClassSelectionListener listener : this.listeners) {

 			listener.onEClassSelected(eClasses);

 		}

 	}

-	

+

 	public void displayInstances(final Set<EObject> eObjects) {

 		this.instComposite.changeInput(eObjects);

-		

+

 	}

 

 }

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java
index ecb9d4155..9208002bd 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  */

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java
index 8d6627bf0..9be012fa7 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  */

@@ -39,9 +39,9 @@ public class EcoreInstancesExplorerComposite extends Composite implements
 		ISelectionProvider {

 

 	private IFacetManager currentfacetMgr = null;

-	

+

 	private final TreeViewer tree;

-	

+

 	private final IFacetManagerListener facetMgrListener = new IFacetManagerListener() {

 		public void facetManagerChanged() {

 			EcoreInstancesExplorerComposite.this.facetManagerChanged();

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java
index dd975a067..3042fdf11 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  */

@@ -42,7 +42,7 @@ public class EcoreMetaExplorerComposite extends Composite implements ISelectionP
 	private final TreeViewer tree;

 	private final IFacetManager facetManager;

 	private final ICustomizationManager customizationMgr;

-	

+

 	private final IFacetManagerListener facetMgrListener = new IFacetManagerListener() {

 		public void facetManagerChanged() {

 			EcoreMetaExplorerComposite.this.facetManagerChanged();

@@ -51,16 +51,16 @@ public class EcoreMetaExplorerComposite extends Composite implements ISelectionP
 

 	public EcoreMetaExplorerComposite(final Composite parent, final MenuManager menuManager) {

 		super(parent, SWT.NONE);

-		

+

 		setLayout(new GridLayout(1, true));

 

 		final Label label = new Label(this, SWT.NONE);

 		label.setText(Messages.EcoreMetaExplorerComposite_Metas);

-		

+

 		this.tree = new TreeViewer(this);

 		this.tree.getControl().setLayoutData(

 				new GridData(SWT.FILL, SWT.FILL, true, true));

-		

+

 		this.facetManager = IFacetManagerFactory.DEFAULT

 				.getOrCreateDefaultFacetManager(new ResourceSetImpl());

 		this.customizationMgr = ICustomizationManagerFactory.DEFAULT

@@ -88,7 +88,7 @@ public class EcoreMetaExplorerComposite extends Composite implements ISelectionP
 		this.tree.refresh();

 		this.tree.setExpandedElements(expanededElts);

 	}

-	

+

 	public void changeInput(final Collection<EPackage> ePackages) {

 		if (this.tree != null && !this.tree.getTree().isDisposed()

 				&& !ePackages.equals(this.tree.getInput())) {

@@ -96,11 +96,11 @@ public class EcoreMetaExplorerComposite extends Composite implements ISelectionP
 			this.tree.refresh();

 		}

 	}

-	

+

 	public ICustomizationManager getCustomizationManager() {

 		return this.customizationMgr;

 	}

-	

+

 	public IFacetManager getFacetManager() {

 		return this.facetManager;

 	}

@@ -122,7 +122,7 @@ public class EcoreMetaExplorerComposite extends Composite implements ISelectionP
 	public void setSelection(final ISelection selection) {

 		this.tree.setSelection(selection);

 	}

-	

+

 	@Override

 	public void dispose() {

 		this.facetManager.addListener(this.facetMgrListener);

diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java
index 61b08d94f..3a729513e 100644
--- a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View

  *    Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle b/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle
index 0394152ae..cedc2e11a 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle
+++ b/org.eclipse.modisco.infra.browser.editor.ui/.checkstyle
@@ -10,7 +10,7 @@ Contributors:
     Nicolas Bros (Mia-Software) - initial API and implementation
 -->
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java
index 13751b39a..d0fd79e34 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

  */

@@ -13,5 +13,5 @@ package org.eclipse.modisco.infra.browser.editor.ui;
 public interface ITreeEditor {

 

 	// DO NOTHING YET

-	

+

 }

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java
index 712ce2ee7..4480ea867 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

  */

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java
index 210adda87..a3c29a534 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

  *    Grégoire Dupé (Mia-Software) - Bug 442800 - API to open new MoDisco Browser

@@ -18,7 +18,7 @@ package org.eclipse.modisco.infra.browser.editor.ui.exceptions;
 public class TreeEditorOpenerException extends Exception {

 

 	private static final long serialVersionUID = -4055299672749732009L;

-	

+

 	public TreeEditorOpenerException(final Throwable throwable) {

 		super(throwable);

 	}

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java
index 0534068d5..dc6c9e3f1 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Activator.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2014 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:

  *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

  */

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
index 57a9e7180..bf5395679 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.

  * 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:

  *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

@@ -16,12 +16,12 @@ import org.eclipse.osgi.util.NLS;
 

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$

-	

+

 	public static String ResourceBrowserOpener_MoDiscoDefaultTreeBrowser;

 	public static String TreeEditorShortcutUtils_CustomHideDerivedReferences;

 	public static String TreeEditorShortcutUtils_CustomHideEmptyReferences;

 	public static String TreeEditorShortcutUtils_CustomShowLinksCount;

-	

+

 	static {

 		// initialize resource bundle

 		NLS.initializeMessages(BUNDLE_NAME, Messages.class);

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java
index 0e4afb65a..11d9b8426 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

  */

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
index 8fe8891b5..2e84d166a 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
@@ -1,13 +1,13 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

- *    Grégoire Dupé (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

+ *    Gr�goire Dup� (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

  */

 package org.eclipse.modisco.infra.browser.editor.ui.internal.editor;

 

@@ -50,7 +50,7 @@ public final class TreeEditorShortcutUtils {
 		return shortcuts;

 	}

 

-	private static void addShortcut(final ResourceSet resourceSet, 

+	private static void addShortcut(final ResourceSet resourceSet,

 			final List<ICustomShortcut> shortcuts, final String uri,

 			final String menuItemLabel) {

 		try {

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java
index 9b24c83f8..3b5a3a614 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/CopyHandler.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2014 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser

  */

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java
index 24f5430b7..594245b08 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

  */

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java
index 4ac1e9b48..6b10bf325 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 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:

  *    Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs

  */

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
index 9b8bfa609..8524001ee 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.

  * 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:

  *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
index 90c7fa828..3acbe4e19 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.

  * 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:

  *    Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java
index f544ad187..d8625d05e 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser

  */

@@ -16,13 +16,13 @@ import org.eclipse.ui.IEditorInput;
 import org.eclipse.ui.IPersistableElement;

 

 public class ResourceSetEditorInput implements IEditorInput {

-	

+

 	private final ResourceSet resourceSet;

 

 	public ResourceSetEditorInput(final ResourceSet resourceSet) {

 		this.resourceSet = resourceSet;

 	}

-	

+

 	public ResourceSet getResourceSet() {

 		return this.resourceSet;

 	}

@@ -38,12 +38,12 @@ public class ResourceSetEditorInput implements IEditorInput {
 		}

 		return result;

 	}

-	

+

 	@Override

 	public int hashCode() {

 		return this.resourceSet.hashCode();

 	}

-	

+

 	public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {

 		// @SuppressWarnings("rawtypes") : imposed by the implemented interface.

 		return null;

diff --git a/org.eclipse.modisco.infra.browser.tests/.checkstyle b/org.eclipse.modisco.infra.browser.tests/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.tests/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
index 576345ed9..b44d01c93 100644
--- a/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
+++ b/org.eclipse.modisco.infra.browser.tests/src/org/eclipse/modisco/infra/browser/tests/TestURIDialog.java
@@ -8,7 +8,7 @@
  * Contributors:

  *     Nicolas Bros (Mia-Software)

  *     Nicolas Guyomar (Mia-software) - Bug 333651 Remove of the MoDisco EPackage view and of the metamodel browsing button

- *     Nicolas Bros (Mia-Software) - Bug 359261 - Junit failure : org.eclipse.modisco.infra.browser.tests.TestURIDialog   

+ *     Nicolas Bros (Mia-Software) - Bug 359261 - Junit failure : org.eclipse.modisco.infra.browser.tests.TestURIDialog

  *******************************************************************************/

 package org.eclipse.modisco.infra.browser.tests;

 

@@ -80,7 +80,7 @@ public class TestURIDialog {
 	@Test

 	public void testOpenModelThroughEPackageRegistryView() {

 		TestUtils.enableOpenEPackageModelsWithMoDiscoBrowser();

-		

+

 		TestUtils.closeAllEditors();

 		TestURIDialog.bot.menu("Window").menu("Show View").menu("Other...").click();

 		SWTBotShell shell = TestURIDialog.bot.shell("Show View");

@@ -91,13 +91,13 @@ public class TestURIDialog {
 

 		final SWTBotView view = TestURIDialog.bot.viewByTitle("EPackage Registry");

 		view.setFocus();

-		

+

 		// Wait for the tree to initialize

 		TestURIDialog.bot.waitUntil(new DefaultCondition() {

 			public boolean test() throws Exception {

 				return view.bot().tree().rowCount() > 1;

 			}

-			

+

 			public String getFailureMessage() {

 				return "EPackage Registry did not initialize";

 			}

diff --git a/org.eclipse.modisco.infra.common.core.tests/.checkstyle b/org.eclipse.modisco.infra.common.core.tests/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.modisco.infra.common.core.tests/.checkstyle
+++ b/org.eclipse.modisco.infra.common.core.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/EcoreCatalogTest.java b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/EcoreCatalogTest.java
index 35354ce9f..53fb496b2 100644
--- a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/EcoreCatalogTest.java
+++ b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/EcoreCatalogTest.java
@@ -34,7 +34,7 @@ public class EcoreCatalogTest {
 	/**

 	 * Check that when we move a facet to another directory we don't get wrong

 	 * name conflict error markers.

-	 * 

+	 *

 	 * @throws Exception

 	 */

 	@Test

@@ -68,7 +68,7 @@ public class EcoreCatalogTest {
 	 * Check that when we change the nsURI of an Ecore file the old nsURI is

 	 * removed from the EPackage.Registry. Check that when we remove an ecore

 	 * file the corresponding EPackage is removed from the EPackage.Registry

-	 * 

+	 *

 	 * @throws Exception

 	 */

 	@Test

diff --git a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/ModelUtilsTest.java b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/ModelUtilsTest.java
index c280a772b..9718384b5 100644
--- a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/ModelUtilsTest.java
+++ b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/ModelUtilsTest.java
@@ -30,16 +30,16 @@ public class ModelUtilsTest {
 	public void testComputeReferencedEPackages() {

 		EPackage facetPackage = EPackage.Registry.INSTANCE.getEPackage(FacetPackage.eNS_URI);

 		Assert.assertNotNull(facetPackage);

-		

+

 		EPackage queryPackage = EPackage.Registry.INSTANCE.getEPackage(QueryPackage.eNS_URI);

 		Assert.assertNotNull(queryPackage);

-		

+

 		EPackage ecorePackage = EPackage.Registry.INSTANCE.getEPackage(EcorePackage.eNS_URI);

 		Assert.assertNotNull(ecorePackage);

-		

+

 		// Facet metamodel has references to Query and Ecore metamodels

 		Set<EPackage> references = ModelUtils.computeReferencedPackages(facetPackage);

-		

+

 		Assert.assertTrue("References from Facet metamodel to Query metamodel were not computed", references.contains(queryPackage)); //$NON-NLS-1$

 		Assert.assertTrue("References from Facet metamodel to Ecore metamodel were not computed", references.contains(ecorePackage)); //$NON-NLS-1$

 	}

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/.checkstyle b/org.eclipse.modisco.infra.discovery.benchmark.core/.checkstyle
index 782630efa..b9bb3e807 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/.checkstyle
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/ISizeDiscoverer.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/ISizeDiscoverer.java
index 334f67ba7..57f91c815 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/ISizeDiscoverer.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/ISizeDiscoverer.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Grégoire Dupé (Mia-Sftware) - Bug 483400 - [Benchmark] The input size should be computable by the discoverer

- *******************************************************************************/ 

+ *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core;

 

 import org.eclipse.core.resources.IProject;

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Activator.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Activator.java
index 4b7f52611..4c7316960 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Activator.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Activator.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2011 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2011 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal;

 

@@ -25,7 +25,7 @@ public class Activator extends Plugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Application.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Application.java
index cbcd578f5..bc223aa6e 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Application.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/Application.java
@@ -64,7 +64,7 @@ public class Application implements IApplication {
 		if (cmd.hasOption('e')) {

 			importExistingPrj(cmd.getOptionValue('e').split(",")); //$NON-NLS-1$

 		}

-		final DiscovererBenchmarkDiscoverer discoverer = 

+		final DiscovererBenchmarkDiscoverer discoverer =

 				new DiscovererBenchmarkDiscoverer();

 		discoverer.setGenerateHtmlReport(cmd.hasOption('r'));

 		final IDiscovererList discos = IDiscovererListFactory.INSTANCE.createDiscovererList();

@@ -154,7 +154,7 @@ public class Application implements IApplication {
 			final String message = String.format("Refreshing the project '%s'",  //$NON-NLS-1$

 					prjDesc.getName());

 			DebugUtils.debug(message);

-			project.refreshLocal(IResource.DEPTH_INFINITE, 

+			project.refreshLocal(IResource.DEPTH_INFINITE,

 					new NullProgressMonitor());

 		} catch (final CoreException e) {

 			final String message = String.format(

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListFactory.java
index f73d8940c..e8d79738c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListFactory.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2011 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2011 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal;

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListSerializer.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListSerializer.java
index 0cf2d9946..757b9c6a6 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListSerializer.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/DiscovererListSerializer.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal;

 

@@ -38,9 +38,9 @@ public class DiscovererListSerializer implements ISerializer<IDiscovererList> {
 

 	private ResourceSet rSet;

 	private Resource inMemoryRes;

-	

-	

-	

+

+

+

 	public DiscovererListSerializer() {

 		this.rSet = new ResourceSetImpl();

 		this.rSet.getResourceFactoryRegistry().getExtensionToFactoryMap()

@@ -53,10 +53,10 @@ public class DiscovererListSerializer implements ISerializer<IDiscovererList> {
 	}

 

 	public String serialize(final IDiscovererList value) {

-		this.inMemoryRes.getContents().clear();		

+		this.inMemoryRes.getContents().clear();

 		this.inMemoryRes.getContents().addAll(value);

 		OutputStream os = new ByteArrayOutputStream();

-		try {	

+		try {

 			this.inMemoryRes.save(os, Collections.EMPTY_MAP);

 			return os.toString();

 		} catch (IOException e) {

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/MathUtils.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/MathUtils.java
index e45316695..f84a0cf9e 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/MathUtils.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/MathUtils.java
@@ -34,11 +34,11 @@ public final class MathUtils {
 		for (int i = 0; i < objects.size(); i++) {

 			final double value = resolver.getValue(objects.get(i));

 			final double delta = Math.abs(value - avg);

-			sum += delta *  delta; 

+			sum += delta *  delta;

 		}

 		return Math.sqrt(sum / objects.size());

 	}

-	

+

 	public interface Resolver<T> {

 		double getValue(T object);

 	}

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/ProjectSetFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/ProjectSetFactory.java
index 70ca85185..7680f0472 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/ProjectSetFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/ProjectSetFactory.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal;

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/XmiToHtmlApplication.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/XmiToHtmlApplication.java
index e05d14757..7096fd794 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/XmiToHtmlApplication.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/XmiToHtmlApplication.java
@@ -37,7 +37,7 @@ public class XmiToHtmlApplication implements IApplication {
 		options.addOption("m", false, Messages.XmiToHtmlApplication_MeasureMemoryUse); //$NON-NLS-1$

 		final CommandLineParser parser = new GnuParser();

 		final CommandLine cmd = parser.parse(options, args);

-		

+

 		final File benchmarkFile = new File(cmd.getOptionValue('x'));

 		final File targetFolder = new File(cmd.getOptionValue('t'));

 		List<? extends Object> arguments = Collections.emptyList();

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererBenchmarkDiscoverer.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererBenchmarkDiscoverer.java
index 5ef5a256c..d46b02fa2 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererBenchmarkDiscoverer.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererBenchmarkDiscoverer.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2011 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2011 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -23,29 +23,29 @@ public interface IDiscovererBenchmarkDiscoverer {
 	 * @return object containing the discoverer ID

 	 */

 	public IDiscovererID getDiscovererID();

-	

+

 	/**

 	 * Give the number of iterations to do for each discoverer to be benchmarked

 	 * @return the number of iterations

 	 */

 	public int getIterations();

-	

+

 	/**

 	 * Return if the discoverer measure the memory usage

 	 * @return true if the memory consumption is measured

 	 */

 	public boolean isMeasureMemoryUse();

-	

+

 	/**

 	 * Give the interval in milliseconds between to measure of the memory usage

 	 * @return the time interval

 	 */

 	public int getMemoryPollingInterval();

-	

+

 	/**

 	 * Return if the discoverer generates an HTML report of the benchmark

 	 * @return true if the report have to be generated

 	 */

 	public boolean isGenerateHtmlReport();

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererID.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererID.java
index a02141b5f..61056b966 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererID.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IDiscovererID.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2011 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2011 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -19,9 +19,9 @@ package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;
 public interface IDiscovererID {

 

 	/**

-	 * Give the discoverer ID in a String 

+	 * Give the discoverer ID in a String

 	 * @return the String version of the discoverer ID

 	 */

 	public String getId();

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventListener.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventListener.java
index a09ac4621..4222c71ee 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventListener.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventListener.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -23,5 +23,5 @@ public interface IEventListener {
 	 * @param event

 	 */

 	public void notifyEvent(Event event);

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManager.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManager.java
index d4dca71d6..c6fcbe574 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManager.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManager.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -23,17 +23,17 @@ public interface IEventManager {
 	 * @param listener

 	 */

 	public void addListener(IEventListener listener);

-	

+

 	/**

 	 * Remove the listener in parameter from the EventManager

 	 * @param listener

 	 */

 	public void removeListener(IEventListener listener);

-	

+

 	/**

 	 * Notify an event to the listeners

 	 * @param event

 	 */

 	public void notifyEvent(Event event);

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManagerFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManagerFactory.java
index 00bac76c5..386340b1f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManagerFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventManagerFactory.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -22,11 +22,11 @@ public interface IEventManagerFactory {
 	 * The factory public instance

 	 */

 	public static IEventManagerFactory INSTANCE = new EventManagerFactory();

-	

+

 	/**

 	 * create a new event manager

 	 * @return The newlyu created event manager instance

 	 */

 	public IEventManager createEventManager();

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventNotifier.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventNotifier.java
index 047449e2c..7381d8353 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventNotifier.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IEventNotifier.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -25,17 +25,17 @@ public interface IEventNotifier {
 	 * @return the list of event type

 	 */

 	public abstract List<EventType> getEventTypes();

-	

+

 	/**

 	 * Add a listener to this notifier

 	 * @param listener

 	 */

 	public abstract void addListener(IEventListener listener);

-	

+

 	/**

 	 * Remove the listener of the notifier

 	 * @param listener

 	 */

 	public abstract void removeListener(IEventListener listener);

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IFileFilter.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IFileFilter.java
index 4072dda54..096b074ef 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IFileFilter.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IFileFilter.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -24,5 +24,5 @@ public interface IFileFilter {
 	 * @return true if file is accepted

 	 */

 	public abstract boolean accept(IFile file);

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IProjectSetSerializer.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IProjectSetSerializer.java
index d2de806e5..03c8a6f4f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IProjectSetSerializer.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/api/IProjectSetSerializer.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.api;

 

@@ -23,7 +23,7 @@ import org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported.IPro
 public class IProjectSetSerializer implements ISerializer<IProjectSet> {

 

 	public IProjectSetSerializer() {

-		

+

 	}

 

 	public Class<IProjectSet> getType() {

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererList.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererList.java
index 5c9aa7607..baa562836 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererList.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererList.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported;

 

@@ -155,7 +155,7 @@ public interface IDiscovererList extends List<Discovery> {
 	 * @see java.util.List#toArray(Object[])

 	 */

 	public <T> T[] toArray(T[] a);

-	

+

 	/**

 	 * @see java.util.List#toString()

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererListFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererListFactory.java
index 4652d495a..7d1d3457b 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererListFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IDiscovererListFactory.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2011 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2011 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported;

 

@@ -24,11 +24,11 @@ public interface IDiscovererListFactory {
 	 * Instance of the factroy

 	 */

 	public static IDiscovererListFactory INSTANCE = new DiscovererListFactory();

-	

+

 	/**

 	 * Creation of a new DiscovererList

 	 * @return the new DiscovererList

 	 */

 	public IDiscovererList createDiscovererList();

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSet.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSet.java
index c2abd0647..dc6a0ca11 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSet.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSet.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported;

@@ -98,7 +98,7 @@ public interface IProjectSet extends List<IProject> {
 	 * @see java.util.List#listIterator()

 	 */

 	public abstract ListIterator<IProject> listIterator();

-	

+

 	/**

 	 * @see java.util.List#listIterator(int)

 	 */

@@ -154,7 +154,7 @@ public interface IProjectSet extends List<IProject> {
 	 * @return a List of IProject

 	 */

 	public abstract List<IProject> getProjects();

-	

+

 	/**

 	 * sort the project and return itself.

 	 * @return

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSetFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSetFactory.java
index 949f8b666..3ef4fb78c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSetFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/exported/IProjectSetFactory.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.exported;

 

@@ -22,7 +22,7 @@ public interface IProjectSetFactory {
 	 * The factory public instance

 	 */

 	public static IProjectSetFactory INSTANCE = new ProjectSetFactory();

-	

+

 	/**

 	 * Create a new project set

 	 * @return the newly created project set

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java
index e1393a3e3..1f2ae760e 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererBenchmarkDiscoverer.java
@@ -171,7 +171,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 					final Project projectDesc = (Project) resource;
 					final IProject project = ResourcesPlugin.getWorkspace()
 							.getRoot().getProject(projectDesc.getName());
-					final AbstractModelDiscoverer<IProject> discoverer = 
+					final AbstractModelDiscoverer<IProject> discoverer =
 							preformIteration(progressMonitor, benchmark,
 									project, discovery, i);
 					postDiscoveryDiscoInit(discovery, discoverer);
@@ -326,7 +326,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 
 	private void safeGenerateHtmlReport(final IProgressMonitor progressMonitor, final Benchmark benchmark) {
 		try {
-			
+
 			generateHtmlReport(progressMonitor, benchmark);
 		} catch (Exception e) {
 			Logger.logError(e, "Report generation fail", Activator.getDefault()); //$NON-NLS-1$
@@ -337,8 +337,8 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 	 * launch the generation of the HTML report and the charts for the benchmark model in parameter
 	 * @param parentMonitor
 	 * @param benchmark
-	 * @throws ReportUtilsException 
-	 * @throws CoreException 
+	 * @throws ReportUtilsException
+	 * @throws CoreException
 	 */
 	private void generateHtmlReport(final IProgressMonitor parentMonitor,
 			final Benchmark benchmark) throws ReportUtilsException, CoreException {
@@ -429,7 +429,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 		for (Method method : clazz.getMethods()) {
 			if (method.isAnnotationPresent(Parameter.class)) {
 				final Parameter param = method.getAnnotation(Parameter.class);
-				if (param.name().equals(paramId) 
+				if (param.name().equals(paramId)
 						&& method.getReturnType().equals(void.class)) {
 					result = method;
 				}
@@ -535,9 +535,9 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 
 	/**
 	 * Initialize the benchmark model element with system information
-	 * @param projects 
+	 * @param projects
 	 * @return the model element
-	 * @throws DiscoveryException 
+	 * @throws DiscoveryException
 	 */
 	private Benchmark benchmarkInit(final IProjectSet projects,
 			final IProgressMonitor progressMonitor) throws DiscoveryException {
@@ -583,10 +583,10 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 	 *            discovery in the launch configuration
 	 * @param discoverer
 	 *            the real discoverer {@link AbstractModelDiscoverer}
-	 * @param benchmark 
+	 * @param benchmark
 	 * @param discovererId
 	 *            the discoverer id
-	 * @throws DiscoveryException 
+	 * @throws DiscoveryException
 	 */
 	private Discovery createDiscovery(final Project projectDesc,
 			final Discovery discovery, final Benchmark benchmark)
@@ -660,7 +660,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 	private void postDiscoveryDiscoInit(final Discovery disco,
 			final AbstractModelDiscoverer<IProject> discoverer) {
 		if (this.iterations > 0) {
-			final MathUtils.Resolver<DiscoveryIteration> discoTimeResolver = 
+			final MathUtils.Resolver<DiscoveryIteration> discoTimeResolver =
 					new MathUtils.Resolver<DiscoveryIteration>() {
 				public double getValue(final DiscoveryIteration object) {
 					return object.getDiscoveryTimeInSeconds();
@@ -670,7 +670,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 					disco.getIterations(), discoTimeResolver));
 			disco.setExecutionTimeStandardDeviation(MathUtils.standardDeviation(
 					disco.getIterations(), discoTimeResolver));
-			final MathUtils.Resolver<DiscoveryIteration> saveTimeResolver = 
+			final MathUtils.Resolver<DiscoveryIteration> saveTimeResolver =
 					new MathUtils.Resolver<DiscoveryIteration>() {
 				public double getValue(final DiscoveryIteration object) {
 					return object.getSaveTimeInSeconds();
@@ -717,7 +717,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 		for (Event event : recoreder.getEvents()) {
 			if (event instanceof EndEvent
 					&& event.getEventType().getName().equals(SAVE_OPERATION)) {
-				final double saveTime = event.getTime() 
+				final double saveTime = event.getTime()
 						- ((EndEvent) event).getBeginning().getTime();
 				discoIter.setSaveTimeInSeconds(saveTime / MSINSEC);
 				discoIter.setDiscoveryTimeInSeconds(discoIter.getDiscoveryTimeInSeconds() - discoIter.getSaveTimeInSeconds());
@@ -802,7 +802,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 	private List<File> createFiles(final IFolder folder, final List<File> files) throws CoreException {
 		for (IResource res : folder.members()) {
 			if (res instanceof IFolder) {
-				final List<File> newFiles = 
+				final List<File> newFiles =
 						createFiles((IFolder) res, new LinkedList<File>());
 				files.addAll(newFiles);
 			} else {
@@ -977,7 +977,7 @@ public class DiscovererBenchmarkDiscoverer extends AbstractModelDiscoverer<IProj
 	 * Allow the selection of the HTML report location
 	 * @param htmlReportLoc the htmlReportLocation to set
 	 */
-	@Parameter(name = "HTML_REPORT_LOCATION", 
+	@Parameter(name = "HTML_REPORT_LOCATION",
 			description = "Tells the location of the HTML report, should be set if GENERATE_HTML_REPORT is true",
 			requiresInputValue = false)
 	public void setHtmlReportLocation(final URI htmlReportUri) {
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererID.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererID.java
index 14bd3c60a..f1a76de8c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererID.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererID.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.impl;

@@ -30,5 +30,5 @@ public class DiscovererID implements IDiscovererID {
 		super();

 		this.id = id;

 	}

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererList.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererList.java
index 1fcc6702b..a10e7e87f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererList.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/DiscovererList.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.impl;

 

@@ -20,14 +20,14 @@ import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmar
 

 /**

  * Discoverer list implementation, basically delegation of the list interface methods

- * @see IDiscovererList 

+ * @see IDiscovererList

  * @author Guillaume Doux

  *

  */

 public class DiscovererList implements IDiscovererList {

 

 

-	private List<Discovery> discoverers; 

+	private List<Discovery> discoverers;

 

 	public DiscovererList() {

 		super();

@@ -45,7 +45,7 @@ public class DiscovererList implements IDiscovererList {
 		}

 		return sb.toString();

 	}

-	

+

 	/* (non-Javadoc)

 	 * @see org.eclipse.modisco.infra.discovery.benchmark.api.IDiscovererList#getDiscoverers()

 	 */

@@ -229,7 +229,7 @@ public class DiscovererList implements IDiscovererList {
 	public <T> T[] toArray(final T[] a) {

 		return this.discoverers.toArray(a);

 	}

-	

-	

-	

+

+

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventAndMemoryRecorder.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventAndMemoryRecorder.java
index b1e1b6f30..50761794a 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventAndMemoryRecorder.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventAndMemoryRecorder.java
@@ -1,10 +1,10 @@
 /*******************************************************************************

  * Copyright (c) 2012, 2015 INRIA and 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 

+ * 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:

  *     Guillaume Doux (INRIA) - Initial API and implementation

  *     Grégoire Dupé (Mia-Software) - Bug 483292 - [Benchmark] long must be used to store memory usage

@@ -28,20 +28,20 @@ import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmar
  */

 public class EventAndMemoryRecorder implements IEventListener {

 

-	

+

 	private long startTime;

 	private long stopTime;

 	private long maxMemoryUsed;

 	private boolean measureMemoryUse;

-	

+

 	private List<MemoryMeasurement> memoryMeasurements;

 	private List<Event> events;

-	

+

 	/**

 	 * attribute recording the memory measures in a job

 	 */

 	private MemoryMeasurementJob job;

-	

+

 	/**

 	 * constructor

 	 * @param measureMemoryUse: true if memory need to be measured

@@ -59,7 +59,7 @@ public class EventAndMemoryRecorder implements IEventListener {
 			this.job = null;

 		}

 	}

-	

+

 	/**

 	 * Re-initialize the event and memory recorder

 	 * @return this event and memory recorder

@@ -77,13 +77,13 @@ public class EventAndMemoryRecorder implements IEventListener {
 	 * Record an event

 	 * @param event: the event to record

 	 */

-	public void notifyEvent(final Event event) {		

+	public void notifyEvent(final Event event) {

 		this.events.add(event);

 

 	}

-	

+

 	/**

-	 * Start time getter 

+	 * Start time getter

 	 * @return the start time

 	 */

 	public long getStartTime() {

@@ -91,7 +91,7 @@ public class EventAndMemoryRecorder implements IEventListener {
 	}

 

 	/**

-	 * stop time getter 

+	 * stop time getter

 	 * @return the stop time

 	 */

 	public long getStopTime() {

@@ -99,7 +99,7 @@ public class EventAndMemoryRecorder implements IEventListener {
 	}

 

 	/**

-	 * Max memory used getter 

+	 * Max memory used getter

 	 * @return the max memory used

 	 */

 	public long getMaxMemoryUsed() {

@@ -132,8 +132,8 @@ public class EventAndMemoryRecorder implements IEventListener {
 

 

 

-	

-	

+

+

 	/**

 	 * Start the record

 	 */

@@ -145,7 +145,7 @@ public class EventAndMemoryRecorder implements IEventListener {
 			this.job.run(new NullProgressMonitor());

 		}

 	}

-	

+

 	/**

 	 * stop the record

 	 */

@@ -165,12 +165,12 @@ public class EventAndMemoryRecorder implements IEventListener {
 					this.maxMemoryUsed = measure.getMemoryUsed();

 				}

 			}

-			

-		

+

+

 		} catch (InterruptedException e) {

 				MoDiscoLogger.logError(e, "Problem with the memory recorder.", org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator.getDefault());

 		}

-		

-		

+

+

 	}

 }

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManager.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManager.java
index defac2b0e..841100ca6 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManager.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManager.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.impl;

@@ -27,8 +27,8 @@ import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmar
  */

 public class EventManager implements IEventManager {

 

-	private List<IEventListener> eventListeners; 

-	

+	private List<IEventListener> eventListeners;

+

 	/**

 	 * Setter for the event listener list

 	 * @param eventListeners

@@ -51,7 +51,7 @@ public class EventManager implements IEventManager {
 	protected EventManager() {

 		this.eventListeners = new ArrayList<IEventListener>();

 	}

-	

+

 	/**

 	 * @see IEventManager#addListener(IEventListener)

 	 * @param eventListeners

@@ -76,7 +76,7 @@ public class EventManager implements IEventManager {
 	 */

 	public void notifyEvent(final Event event) {

 		for (IEventListener listener : this.eventListeners) {

-			listener.notifyEvent(event);	

+			listener.notifyEvent(event);

 		}

 	}

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManagerFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManagerFactory.java
index 98af92bda..f823298db 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManagerFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/EventManagerFactory.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.impl;

@@ -20,7 +20,7 @@ import org.eclipse.modisco.infra.discovery.benchmark.core.internal.api.IEventMan
  */

 public class EventManagerFactory implements IEventManagerFactory {

 

-	

+

 	public IEventManager createEventManager() {

 		return new EventManager();

 	}

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ProjectSet.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ProjectSet.java
index 3712a1dbb..e1dd4c735 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ProjectSet.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ProjectSet.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 

 package org.eclipse.modisco.infra.discovery.benchmark.core.internal.impl;

@@ -53,7 +53,7 @@ public class ProjectSet implements IProjectSet {
 	 * return the size of the project

 	 * @param p must be owned by the projectSet

 	 * @return the size

-	 * @throws CoreException 

+	 * @throws CoreException

 	 */

 	public long getProjectSize(final IProject p) throws CoreException {

 		if (this.projectSize.keySet().contains(p)) {

@@ -89,7 +89,7 @@ public class ProjectSet implements IProjectSet {
 			public int compare(final IProject arg0, final IProject arg1) {

 				try {

 					if (getProjectSize(arg0) < getProjectSize(arg1)) {

-						return -1; 

+						return -1;

 					}

 					if (getProjectSize(arg0) == getProjectSize(arg1)) {

 						return 0;

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ReportUtils.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ReportUtils.java
index 94ac3f001..1f7ab38b1 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ReportUtils.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/impl/ReportUtils.java
@@ -1,11 +1,11 @@
 /*******************************************************************************

  * Copyright (c) 2012, 2015 INRIA, and 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:

  *    Guillaume Doux (INRIA) - Initial API and implementation

  *    Grégoire Dupé (Mia-Software) - Bug 482672 - Benchmark command line interface

@@ -31,25 +31,25 @@ public final class ReportUtils {
 	private ReportUtils() {

 		// Must not be used

 	}

-	

+

 	public static void generateReport(final Benchmark benchmark,

-			final File targetFolder, final List<? extends Object> arguments, 

+			final File targetFolder, final List<? extends Object> arguments,

 			final boolean measureMemoryUse) throws ReportUtilsException {

 		try {

 			// Generation of the HTML report

 			final HtmlReport report = new HtmlReport(benchmark, targetFolder, arguments);

 			report.doGenerate(null);

 			// Generation of the charts

-			final BenchmarkChartGeneration chartGenerator = 

+			final BenchmarkChartGeneration chartGenerator =

 					new BenchmarkChartGeneration(targetFolder, measureMemoryUse);

 			chartGenerator.generateAll(benchmark);

 		} catch (final Exception e) {

 			throw new ReportUtilsException(e);

 		}

 	}

-	

+

 	public static void generateReport(final URI benchmarkUri, final File targetFolder,

-			final List<? extends Object> arguments, 

+			final List<? extends Object> arguments,

 			final boolean measureMemoryUse) throws ReportUtilsException {

 		final ResourceSet resourceSet = new ResourceSetImpl();

 		final Resource resource = resourceSet.getResource(benchmarkUri, true);

@@ -71,14 +71,14 @@ public final class ReportUtils {
 					measureMemoryUse);

 		} else {

 			for (Benchmark benchmark : benchmarks) {

-				generateReport(benchmark, targetFolder, arguments, 

+				generateReport(benchmark, targetFolder, arguments,

 						measureMemoryUse);

 			}

 		}

 	}

-	

+

 	public static void generateReport(final File benchmarkFile, final File targetFolder,

-			final List<? extends Object> arguments, 

+			final List<? extends Object> arguments,

 			final boolean measureMemoryUse) throws ReportUtilsException {

 		final URI uri = URI.createFileURI(benchmarkFile.getAbsolutePath());

 		generateReport(uri, targetFolder, arguments, measureMemoryUse);

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
index cbb94e95c..de96866de 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport.java
@@ -4,7 +4,7 @@
  * 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:
  *     Obeo - initial API and implementation
  *     Guillaume Doux (INRIA)
@@ -39,14 +39,14 @@ public class HtmlReport extends AbstractAcceleoGenerator {
      * @generated
      */
     public static final String MODULE_FILE_NAME = "/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/HtmlReport";
-    
+
     /**
      * The name of the templates that are to be generated.
      *
      * @generated
      */
     public static final String[] TEMPLATE_NAMES = { "HtmlReport" };
-    
+
     /**
      * The list of properties files from the launch parameters (Launch configuration).
      *
@@ -74,7 +74,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 
     /**
      * This allows clients to instantiates a generator with all required information.
-     * 
+     *
      * @param modelURI
      *            URI where the model on which this generator will be used is located.
      * @param targetFolder
@@ -95,7 +95,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 
     /**
      * This allows clients to instantiates a generator with all required information.
-     * 
+     *
      * @param model
      *            We'll iterate over the content of this element to find Objects matching the first parameter
      *            of the template we need to call.
@@ -113,10 +113,10 @@ public class HtmlReport extends AbstractAcceleoGenerator {
             List<? extends Object> arguments) throws IOException {
         initialize(model, targetFolder, arguments);
     }
-    
+
     /**
      * This can be used to launch the generation from a standalone application.
-     * 
+     *
      * @param args
      *            Arguments of the generation.
      * @generated
@@ -128,9 +128,9 @@ public class HtmlReport extends AbstractAcceleoGenerator {
             } else {
                 URI modelURI = URI.createFileURI(args[0]);
                 File folder = new File(args[1]);
-                
+
                 List<String> arguments = new ArrayList<String>();
-                
+
                 /*
                  * If you want to change the content of this method, do NOT forget to change the "@generated"
                  * tag in the Javadoc of this method to "@generated NOT". Without this new tag, any compilation
@@ -143,23 +143,23 @@ public class HtmlReport extends AbstractAcceleoGenerator {
                  * If your main template is called on an element of your model and a String, you can
                  * add in "arguments" this "String" attribute.
                  */
-                
+
                 HtmlReport generator = new HtmlReport(modelURI, folder, arguments);
-                
+
                 /*
                  * Add the properties from the launch arguments.
                  * If you want to programmatically add new properties, add them in "propertiesFiles"
                  * You can add the absolute path of a properties files, or even a project relative path.
-                 * If you want to add another "protocol" for your properties files, please override 
+                 * If you want to add another "protocol" for your properties files, please override
                  * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
                  * The behavior of the properties loader service is explained in the Acceleo documentation
                  * (Help -> Help Contents).
                  */
-                 
+
                 for (int i = 2; i < args.length; i++) {
                     generator.addPropertiesFile(args[i]);
                 }
-                
+
                 generator.doGenerate(new BasicMonitor());
             }
         } catch (IOException e) {
@@ -169,7 +169,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 
     /**
      * Launches the generation described by this instance.
-     * 
+     *
      * @param monitor
      *            This will be used to display progress information to the user.
      * @throws IOException
@@ -204,10 +204,10 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 
         super.doGenerate(monitor);
     }
-    
+
     /**
      * If this generator needs to listen to text generation events, listeners can be returned from here.
-     * 
+     *
      * @return List of listeners that are to be notified when text is generated through this launch.
      * @generated
      */
@@ -222,7 +222,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
          */
         return listeners;
     }
-    
+
     /**
      * If you need to change the way files are generated, this is your entry point.
      * <p>
@@ -240,7 +240,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
      * <p>
      * All three of these default strategies support merging through JMerge.
      * </p>
-     * 
+     *
      * @return The generation strategy that is to be used for generations launched through this launcher.
      * @generated
      */
@@ -248,11 +248,11 @@ public class HtmlReport extends AbstractAcceleoGenerator {
     public IAcceleoGenerationStrategy getGenerationStrategy() {
         return super.getGenerationStrategy();
     }
-    
+
     /**
      * This will be called in order to find and load the module that will be launched through this launcher.
      * We expect this name not to contain file extension, and the module to be located beside the launcher.
-     * 
+     *
      * @return The name of the module that is to be launched.
      * @generated
      */
@@ -260,12 +260,12 @@ public class HtmlReport extends AbstractAcceleoGenerator {
     public String getModuleName() {
         return MODULE_FILE_NAME;
     }
-    
+
     /**
      * If the module(s) called by this launcher require properties files, return their qualified path from
      * here.Take note that the first added properties files will take precedence over subsequent ones if they
      * contain conflicting keys.
-     * 
+     *
      * @return The list of properties file we need to add to the generation context.
      * @see java.util.ResourceBundle#getBundle(String)
      * @generated
@@ -281,37 +281,37 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 
         /*
          * TODO if your generation module requires access to properties files, add their qualified path to the list here.
-         * 
+         *
          * Properties files can be located in an Eclipse plug-in or in the file system (all Acceleo projects are Eclipse
          * plug-in). In order to use properties files located in an Eclipse plugin, you need to add the path of the properties
          * files to the "propertiesFiles" list:
-         * 
+         *
          * final String prefix = "platform:/plugin/";
          * final String pluginName = "org.eclipse.acceleo.module.sample";
          * final String packagePath = "/org/eclipse/acceleo/module/sample/properties/";
          * final String fileName = "default.properties";
          * propertiesFiles.add(prefix + pluginName + packagePath + fileName);
-         * 
+         *
          * With this mechanism, you can load properties files from your plugin or from another plugin.
-         * 
+         *
          * You may want to load properties files from the file system, for that you need to add the absolute path of the file:
-         * 
+         *
          * propertiesFiles.add("C:\Users\MyName\MyFile.properties");
-         * 
+         *
          * If you want to let your users add properties files located in the same folder as the model:
          *
-         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) { 
+         * if (EMFPlugin.IS_ECLIPSE_RUNNING && model != null && model.eResource() != null) {
          *     propertiesFiles.addAll(AcceleoEngineUtils.getPropertiesFilesNearModel(model.eResource()));
          * }
-         * 
+         *
          * To learn more about Properties Files, have a look at the Acceleo documentation (Help -> Help Contents).
          */
         return propertiesFiles;
     }
-    
+
     /**
      * Adds a properties file in the list of properties files.
-     * 
+     *
      * @param propertiesFile
      *            The properties file to add.
      * @generated
@@ -323,10 +323,10 @@ public class HtmlReport extends AbstractAcceleoGenerator {
     public void addPropertiesFile(String propertiesFile) {
         this.propertiesFiles.add(propertiesFile);
     }
-    
+
     /**
      * This will be used to get the list of templates that are to be launched by this launcher.
-     * 
+     *
      * @return The list of templates to call on the module {@link #getModuleName()}.
      * @generated
      */
@@ -334,10 +334,10 @@ public class HtmlReport extends AbstractAcceleoGenerator {
     public String[] getTemplateNames() {
         return TEMPLATE_NAMES;
     }
-    
+
     /**
      * This can be used to update the resource set's package registry with all needed EPackages.
-     * 
+     *
      * @param resourceSet
      *            The resource set which registry has to be updated.
      * @generated
@@ -366,32 +366,32 @@ public class HtmlReport extends AbstractAcceleoGenerator {
         /*
          * If you need additional package registrations, you can register them here. The following line
          * (in comment) is an example of the package registration for UML.
-         * 
+         *
          * You can use the method  "isInWorkspace(Class c)" to check if the package that you are about to
          * register is in the workspace.
-         * 
+         *
          * To register a package properly, please follow the following conventions:
          *
          * If the package is located in another plug-in, already installed in Eclipse. The following content should
          * have been generated at the beginning of this method. Do not register the package using this mechanism if
          * the metamodel is located in the workspace.
-         *  
+         *
          * if (!isInWorkspace(UMLPackage.class)) {
          *     // The normal package registration if your metamodel is in a plugin.
          *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
          * }
-         * 
+         *
          * If the package is located in another project in your workspace, the plugin containing the package has not
          * been register by EMF and Acceleo should register it automatically. If you want to use the generator in
          * stand alone, the regular registration (seen a couple lines before) is needed.
-         * 
+         *
          * To learn more about Package Registration, have a look at the Acceleo documentation (Help -> Help Contents).
          */
     }
 
     /**
      * This can be used to update the resource set's resource factory registry with all needed factories.
-     * 
+     *
      * @param resourceSet
      *            The resource set which registry has to be updated.
      * @generated
@@ -405,17 +405,17 @@ public class HtmlReport extends AbstractAcceleoGenerator {
          * of the Acceleo module with the main template that has caused the creation of this class will
          * revert your modifications.
          */
-        
+
         /*
          * TODO If you need additional resource factories registrations, you can register them here. the following line
          * (in comment) is an example of the resource factory registration for UML.
          *
          * If you want to use the generator in stand alone, the resource factory registration will be required.
-         *  
-         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents). 
-         */ 
-        
+         *
+         * To learn more about the registration of Resource Factories, have a look at the Acceleo documentation (Help -> Help Contents).
+         */
+
         // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
     }
-    
+
 }
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/BenchmarkChartGeneration.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/BenchmarkChartGeneration.java
index 2bd7363f3..908f6fc88 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/BenchmarkChartGeneration.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/BenchmarkChartGeneration.java
@@ -1,10 +1,10 @@
 /*******************************************************************************

  * Copyright (c) 2012, 2015 INRIA and 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 

+ * 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:

  *     Guillaume Doux - INRIA - Initial API and implementation

  *     Grégoire Dupé (Mia-Software) - Bug 483400 - [Benchmark] The input size should be computable by the discoverer

@@ -54,7 +54,7 @@ public class BenchmarkChartGeneration {
 		this.location = location;

 		this.measureMemory = measureMemory;

 		this.factory = ChartFactory.eINSTANCE;

-		this.helper = BirtGraphHelper.getInstance();		

+		this.helper = BirtGraphHelper.getInstance();

 	}

 

 	public void generateAll(final Benchmark b) throws Exception {

@@ -72,7 +72,7 @@ public class BenchmarkChartGeneration {
 				createDiscoveryTimeAsProjectSizeAveraged(b, d);

 				testedDiscoverers.add(d.getDiscovererId());

 			}

-		}			

+		}

 	}

 

 	private void createDiscoveryTimeAsProjectSizeAveraged(final Benchmark b, final Discovery d) throws Exception {

@@ -272,7 +272,7 @@ public class BenchmarkChartGeneration {
 		memory.setLegend(Messages.BenchmarkChartGeneration_UsedMem);

 		chart.getAxes().add(time);

 		chart.getAxes().add(memory);

-		

+

 		for (Event mm : di.getMemoryMeasurements()) {

 			if (mm instanceof MemoryMeasurement) {

 				MemoryMeasurement mem = (MemoryMeasurement) mm;

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/ReportingUtilities.java b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/ReportingUtilities.java
index 3347b4e6a..8c5d68d26 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/ReportingUtilities.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/src/org/eclipse/modisco/infra/discovery/benchmark/core/internal/reporting/internal/ReportingUtilities.java
@@ -1,7 +1,7 @@
 /*******************************************************************************

  * Copyright (c) 2011, 2015 Mia-Software and INRIA.

- * All rights reserved. This program and the accompanying materials are made 

- * available under the terms of the Eclipse Public License v1.0 which 

+ * 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

  *

@@ -22,7 +22,7 @@ import org.eclipse.modisco.infra.discovery.benchmark.metamodel.internal.benchmar
 public final class ReportingUtilities {

 

 	private ReportingUtilities() { }

-	

+

 	public static double maxExecutionTime(final Collection<DiscoveryIteration> iterations) {

 		double maxExecutionTime = 0.0;

 		for (DiscoveryIteration iteration : iterations) {

@@ -39,7 +39,7 @@ public final class ReportingUtilities {
 		}

 		return maxSaveTime;

 	}

-	

+

 	public static String sizeWithUnit(final Double value) {

 		final double unitChange = 1024.0;

 

@@ -55,7 +55,7 @@ public final class ReportingUtilities {
 		}

 		return (int) result + " " + unitName(unit); //$NON-NLS-1$

 	}

-	

+

 	// these constants are only here to make checkstyle happy

 	private static final int UNIT_0 = 0;

 	private static final int UNIT_1 = 1;

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.checkstyle b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.classpath b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.classpath
index efdacce14..e12efdd53 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.classpath
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/build.properties b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/build.properties
index 90dc876dc..e61cfcc45 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/build.properties
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/build.properties
@@ -1,9 +1,14 @@
-

-# <copyright>

-# </copyright>

-#

-# $Id$

-

+###############################################################################

+# Copyright (c) 2012, 2018 INRIA and 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:

+#     Guillaume Doux (INRIA) - Initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

+# 

 bin.includes = .,\

                model/,\

                META-INF/,\

@@ -11,6 +16,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/,\

+           src/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel
index a70224f21..9edb1902c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/model/benchmark.genmodel
@@ -1,7 +1,7 @@
 <?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="Copyright (c) 2012, 2015 INRIA and 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;     Guillaume Doux (INRIA) - Initial API and implementation&#xD;&#xA;     Grégoire Dupé (Mia-Software) - Bug 483292 - [Benchmark] long must be used to store memory usage&#xD;&#xA;     Grégoire Dupé (Mia-Software) - Bug 483400 - [Benchmark] The input size should be computable by the discoverer&#xD;&#xA;"

-    modelDirectory="/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2012, 2018 INRIA and 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;     Guillaume Doux (INRIA) - Initial API and implementation&#xD;&#xA;     Grégoire Dupé (Mia-Software) - Bug 483292 - [Benchmark] long must be used to store memory usage&#xD;&#xA;     Grégoire Dupé (Mia-Software) - Bug 483400 - [Benchmark] The input size should be computable by the discoverer&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen"

     modelPluginID="org.eclipse.modisco.infra.discovery.benchmark.metamodel" modelName="Benchmark"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" runtimeVersion="2.6"

     usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog platform:/plugin/org.eclipse.modisco.infra.discovery/model/discovery.genmodel#//discovery platform:/plugin/org.eclipse.emf.facet.util.emf.core/model/serialization.genmodel#//serialization">

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BeginEvent.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BeginEvent.java
index 207406654..207406654 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BeginEvent.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BeginEvent.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Benchmark.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Benchmark.java
index d35650297..d35650297 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Benchmark.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Benchmark.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkFactory.java
index 4ff354c2c..4ff354c2c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkFactory.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkPackage.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkPackage.java
index d44f6c21d..d44f6c21d 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkPackage.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/BenchmarkPackage.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Discovery.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Discovery.java
index c28c86721..c28c86721 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Discovery.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Discovery.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/DiscoveryIteration.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/DiscoveryIteration.java
index d20625b62..d20625b62 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/DiscoveryIteration.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/DiscoveryIteration.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EndEvent.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EndEvent.java
index 2cffd7b96..2cffd7b96 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EndEvent.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EndEvent.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Event.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Event.java
index c82e13d46..c82e13d46 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Event.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Event.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EventType.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EventType.java
index 85e502dae..85e502dae 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EventType.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/EventType.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/File.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/File.java
index 837e61122..837e61122 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/File.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/File.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/MemoryMeasurement.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/MemoryMeasurement.java
index 34b4fba0a..34b4fba0a 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/MemoryMeasurement.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/MemoryMeasurement.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Project.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Project.java
index ac789ea5c..ac789ea5c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Project.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Project.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Resource.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Resource.java
index 2a9d4b28f..2a9d4b28f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Resource.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/Resource.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BeginEventImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BeginEventImpl.java
index ccb5b3473..ccb5b3473 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BeginEventImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BeginEventImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkFactoryImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkFactoryImpl.java
index 26bdd9e31..26bdd9e31 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkFactoryImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkFactoryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkImpl.java
index 1b1391085..1b1391085 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkPackageImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkPackageImpl.java
index 302bfdb2f..302bfdb2f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkPackageImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/BenchmarkPackageImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryImpl.java
index f5100fcc3..f5100fcc3 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryIterationImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryIterationImpl.java
index e9a1588a7..e9a1588a7 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryIterationImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/DiscoveryIterationImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EndEventImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EndEventImpl.java
index 32b4b5f8b..32b4b5f8b 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EndEventImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EndEventImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventImpl.java
index cd91e6e12..cd91e6e12 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventTypeImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventTypeImpl.java
index e5eeca10d..e5eeca10d 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventTypeImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/EventTypeImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/FileImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/FileImpl.java
index 6679bfddc..6679bfddc 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/FileImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/FileImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/MemoryMeasurementImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/MemoryMeasurementImpl.java
index ab05cf091..ab05cf091 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/MemoryMeasurementImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/MemoryMeasurementImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ProjectImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ProjectImpl.java
index 111d6b379..111d6b379 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ProjectImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ProjectImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ResourceImpl.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ResourceImpl.java
index 5a690593c..5a690593c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ResourceImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/impl/ResourceImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkAdapterFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkAdapterFactory.java
index 5d16d5449..5d16d5449 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkAdapterFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkAdapterFactory.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkSwitch.java b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkSwitch.java
index 382a94431..382a94431 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkSwitch.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/src-gen/org/eclipse/modisco/infra/discovery/benchmark/metamodel/internal/benchmark/util/BenchmarkSwitch.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/.checkstyle b/org.eclipse.modisco.infra.discovery.benchmark.ui/.checkstyle
index 782630efa..b9bb3e807 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/.checkstyle
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/Activator.java b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/Activator.java
index 12c721e1d..314483cd8 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/Activator.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/Activator.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.ui;

 

@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListComposite.java b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListComposite.java
index df1942efc..da7321427 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListComposite.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListComposite.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.ui.util;

 

@@ -50,7 +50,7 @@ import org.eclipse.swt.widgets.Text;
 import org.eclipse.ui.dialogs.ListSelectionDialog;

 import org.eclipse.ui.model.WorkbenchContentProvider;

 

-/** 

+/**

  * class implementing the cell editor for selecting the list of discoverers to bench

  * @author Guillaume Doux

  *

@@ -223,16 +223,16 @@ public class DiscovererListComposite extends AbstractCellEditorComposite<IDiscov
 								pvalue.setParameter(parameter);

 								pvalue.setValue(parameterValues[i]);

 								configuration.getParameterValues().add(pvalue);

-							}		

+							}

 						}

 						disco.setDiscovererLaunchConfiguration(configuration);

-					}			

+					}

 					selectedDiscoverers.add(disco);

 				}

 				setValue(selectedDiscoverers);

 				fireCommit();

 			}

-		}	

+		}

 	}

 

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListCompositeFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListCompositeFactory.java
index ca6a16e0f..2339f9c54 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListCompositeFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererListCompositeFactory.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.ui.util;

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererSelectionDialog.java b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererSelectionDialog.java
index bd46dcff0..620ee898c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererSelectionDialog.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/DiscovererSelectionDialog.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.ui.util;

 

@@ -64,7 +64,7 @@ public class DiscovererSelectionDialog extends FilteredItemsSelectionDialog {
 	}

 

 

-	private static final String DIALOG_SETTINGS = "DiscovererSelectionDialogSettings";	

+	private static final String DIALOG_SETTINGS = "DiscovererSelectionDialogSettings";

 

 	@Override

 	protected Control createExtendedContentArea(final Composite parent) {

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectComposite.java b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectComposite.java
index 627a39180..0c8ff02d0 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectComposite.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectComposite.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.ui.util;

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectCompositeFactory.java b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectCompositeFactory.java
index 0c7df69e4..a3aa53ca0 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectCompositeFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/src/org/eclipse/modisco/infra/discovery/benchmark/ui/util/MultiIProjectCompositeFactory.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.infra.discovery.benchmark.ui.util;

 

diff --git a/org.eclipse.modisco.infra.discovery.benchmark/.checkstyle b/org.eclipse.modisco.infra.discovery.benchmark/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.infra.discovery.benchmark/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/.classpath b/org.eclipse.modisco.infra.discovery.benchmark/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/.classpath
+++ b/org.eclipse.modisco.infra.discovery.benchmark/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.infra.discovery.benchmark/build.properties b/org.eclipse.modisco.infra.discovery.benchmark/build.properties
index d817c14da..babf2ed4f 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/build.properties
+++ b/org.eclipse.modisco.infra.discovery.benchmark/build.properties
@@ -8,7 +8,7 @@
 # Contributors:

 #    Nicolas Bros (Mia-Software) - initial API and implementation

 ###############################################################################

-# Copyright (c) 2009, 2011 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -18,6 +18,7 @@
 #     Gregoire DUPE (Mia-Software) - initial API and implementation

 #     Gregoire DUPE (Mia-Software) - Bug 341752 - Extract report metamodel from the benchmark plug-in to avoid Acceleo troubles.

 #     Nicolas Bros (Mia-Software)

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # 

 

 bin.includes = .,\

@@ -27,6 +28,6 @@ bin.includes = .,\
                OSGI-INF/,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.infra.discovery.benchmark/model/benchmark.genmodel b/org.eclipse.modisco.infra.discovery.benchmark/model/benchmark.genmodel
index e309cae03..4f3c8c572 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/model/benchmark.genmodel
+++ b/org.eclipse.modisco.infra.discovery.benchmark/model/benchmark.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2009, 2011 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;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - Bug 341752 - Extract report metamodel from the benchmark plug-in to avoid Acceleo troubles.&#xD;&#xA;    Nicolas Bros (Mia-Software)&#xD;&#xA;"

-    modelDirectory="/org.eclipse.modisco.infra.discovery.benchmark/src" editDirectory="/org.eclipse.modisco.infra.discovery.benchmark.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - Bug 341752 - Extract report metamodel from the benchmark plug-in to avoid Acceleo troubles.&#xD;&#xA;    Nicolas Bros (Mia-Software)&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.modisco.infra.discovery.benchmark/src-gen" editDirectory="/org.eclipse.modisco.infra.discovery.benchmark.edit/src"

     editorDirectory="/org.eclipse.modisco.infra.discovery.benchmark.editor/src" modelPluginID="org.eclipse.modisco.infra.discovery.benchmark"

     modelName="benchmark" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" editPluginID="org.eclipse.modisco.infra.discovery.benchmark.edit"

diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/AveragedMultiDiscoveryBenchmark.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/AveragedMultiDiscoveryBenchmark.java
index 5df209275..5df209275 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/AveragedMultiDiscoveryBenchmark.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/AveragedMultiDiscoveryBenchmark.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/AveragedProjectDiscovery.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/AveragedProjectDiscovery.java
index 37afa41bd..37afa41bd 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/AveragedProjectDiscovery.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/AveragedProjectDiscovery.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/Benchmark.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/Benchmark.java
index 160730404..160730404 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/Benchmark.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/Benchmark.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkConstants.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkConstants.java
index 3d69916b0..3d69916b0 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkConstants.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkConstants.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkFactory.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkFactory.java
index 08283bb0a..08283bb0a 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkFactory.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkPackage.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkPackage.java
index 28bf698f4..28bf698f4 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkPackage.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/BenchmarkPackage.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/DiscoveredProject.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/DiscoveredProject.java
index 836b13ca9..836b13ca9 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/DiscoveredProject.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/DiscoveredProject.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/Discovery.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/Discovery.java
index eefc953dc..eefc953dc 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/Discovery.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/Discovery.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/File.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/File.java
index 9461924e4..9461924e4 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/File.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/File.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/MultiDiscoveryBenchmark.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/MultiDiscoveryBenchmark.java
index 3c4365a6a..3c4365a6a 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/MultiDiscoveryBenchmark.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/MultiDiscoveryBenchmark.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/MultiProjectBenchmark.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/MultiProjectBenchmark.java
index 64d8a4d3b..64d8a4d3b 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/MultiProjectBenchmark.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/MultiProjectBenchmark.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/Project.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/Project.java
index 8a935c19c..8a935c19c 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/Project.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/Project.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/ProjectDiscovery.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/ProjectDiscovery.java
index 9210a8067..9210a8067 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/ProjectDiscovery.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/ProjectDiscovery.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedMultiDiscoveryBenchmarkImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedMultiDiscoveryBenchmarkImpl.java
index 0c5ef20c9..0c5ef20c9 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedMultiDiscoveryBenchmarkImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedMultiDiscoveryBenchmarkImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedProjectDiscoveryImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedProjectDiscoveryImpl.java
index e402c00b9..e402c00b9 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedProjectDiscoveryImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/AveragedProjectDiscoveryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkFactoryImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkFactoryImpl.java
index 333e3e82a..333e3e82a 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkFactoryImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkFactoryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkImpl.java
index 613ae3874..613ae3874 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkPackageImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkPackageImpl.java
index 8c2916e24..8c2916e24 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkPackageImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/BenchmarkPackageImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveredProjectImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveredProjectImpl.java
index e3c2219b8..e3c2219b8 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveredProjectImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveredProjectImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveryImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveryImpl.java
index e241d5df4..e241d5df4 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveryImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/DiscoveryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/FileImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/FileImpl.java
index 9b16d7fc3..9b16d7fc3 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/FileImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/FileImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiDiscoveryBenchmarkImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiDiscoveryBenchmarkImpl.java
index eb3dba8d4..eb3dba8d4 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiDiscoveryBenchmarkImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiDiscoveryBenchmarkImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiProjectBenchmarkImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiProjectBenchmarkImpl.java
index 167b776d0..167b776d0 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiProjectBenchmarkImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/MultiProjectBenchmarkImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectDiscoveryImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectDiscoveryImpl.java
index b39278f68..b39278f68 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectDiscoveryImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectDiscoveryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectImpl.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectImpl.java
index bedfac241..bedfac241 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectImpl.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/impl/ProjectImpl.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkAdapterFactory.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkAdapterFactory.java
index 1cc8ddeef..1cc8ddeef 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkAdapterFactory.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkAdapterFactory.java
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkSwitch.java b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkSwitch.java
index 74cd573d8..74cd573d8 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/src/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkSwitch.java
+++ b/org.eclipse.modisco.infra.discovery.benchmark/src-gen/org/eclipse/modisco/infra/discovery/benchmark/util/BenchmarkSwitch.java
diff --git a/org.eclipse.modisco.infra.discovery.core.tests/.checkstyle b/org.eclipse.modisco.infra.discovery.core.tests/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.infra.discovery.core.tests/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestInitialValues.java b/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestInitialValues.java
index ac763ea8c..766016a10 100644
--- a/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestInitialValues.java
+++ b/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/TestInitialValues.java
@@ -31,7 +31,7 @@ public class TestInitialValues {
 		Object initialValue = IDiscoveryManager.INSTANCE.getInitialValue(discovererParameter, discovererDescription, new Object());

 		assertEquals(initialValue, BasicDiscovererWithInitialValue.DEFAULT_VALUE);

 	}

-	

+

 	@Test

 	public void testNoInitialValue() throws Exception {

 		DiscovererDescription discovererDescription = IDiscoveryManager.INSTANCE.getDiscovererDescription("BasicDiscovererForTests");

diff --git a/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/discoverers/BasicDiscovererWithInitialValue.java b/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/discoverers/BasicDiscovererWithInitialValue.java
index e12c5c90c..544709617 100644
--- a/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/discoverers/BasicDiscovererWithInitialValue.java
+++ b/org.eclipse.modisco.infra.discovery.core.tests/src/org/eclipse/modisco/infra/discovery/core/tests/discoverers/BasicDiscovererWithInitialValue.java
@@ -28,7 +28,7 @@ public class BasicDiscovererWithInitialValue implements IDiscoverer<Object> {
 		this.myDiscoIn = value;

 	}

 

-	@SuppressWarnings("unused") // framework defined signature 

+	@SuppressWarnings("unused") // framework defined signature

 	@ParameterInitialValue(name = "DISCO_IN")

 	public static Integer getMyDiscoInInitialValue(final Object source) {

 		return BasicDiscovererWithInitialValue.DEFAULT_VALUE;

diff --git a/org.eclipse.modisco.infra.discovery.core/.checkstyle b/org.eclipse.modisco.infra.discovery.core/.checkstyle
index aba95874c..c900132f3 100644
--- a/org.eclipse.modisco.infra.discovery.core/.checkstyle
+++ b/org.eclipse.modisco.infra.discovery.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/AbstractDiscoverer.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/AbstractDiscoverer.java
index f784d5675..2364e81e3 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/AbstractDiscoverer.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/AbstractDiscoverer.java
@@ -31,7 +31,7 @@ import org.eclipse.modisco.infra.discovery.core.internal.DiscoveryManager;
 /**

  * A base implementation of Discoverer, which proposes to centralize some

  * parameters properties and behaviors :

- * 

+ *

  * <ul>

  * <li>

  * Control of source and parameters values at the beginning of a discovery

@@ -40,7 +40,7 @@ import org.eclipse.modisco.infra.discovery.core.internal.DiscoveryManager;
  * <li>

  * Source refresh management

  * </ul>

- * 

+ *

  * @param <T>

  *            the type of source of the discovery

  */

@@ -95,7 +95,7 @@ public abstract class AbstractDiscoverer<T> implements IDiscoverer<T> {
 

 	/**

 	 * A default implementation for source refresh.

-	 * 

+	 *

 	 * It invokes the IResource.refreshLocal() service if the source is an

 	 * instance of org.eclipse.core.resources.IResource

 	 */

@@ -112,7 +112,7 @@ public abstract class AbstractDiscoverer<T> implements IDiscoverer<T> {
 

 	/**

 	 * Utility service for usual isApplicableTo test.

-	 * 

+	 *

 	 * @return true if the source is an accessible instance of

 	 *         {@link IJavaProject} or {@link IProject} with java nature.

 	 */

@@ -135,7 +135,7 @@ public abstract class AbstractDiscoverer<T> implements IDiscoverer<T> {
 

 	/**

 	 * Utility service for usual isApplicableTo test.

-	 * 

+	 *

 	 * @return true if the source is an instance of {@link IFolder}

 	 */

 	public static boolean isAFolder(final Object source) {

@@ -144,7 +144,7 @@ public abstract class AbstractDiscoverer<T> implements IDiscoverer<T> {
 

 	/**

 	 * Utility service for usual isApplicableTo test.

-	 * 

+	 *

 	 * @return true if the source is an instance of {@link IProject}.

 	 */

 	public static boolean isAProject(final Object source) {

@@ -153,7 +153,7 @@ public abstract class AbstractDiscoverer<T> implements IDiscoverer<T> {
 

 	/**

 	 * Utility service for usual isApplicableTo test.

-	 * 

+	 *

 	 * @param source

 	 * @param fileExtension

 	 *            the file extension to test. May be <code>null</code> to test

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoverer.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoverer.java
index 2f09d7c1b..98d3d3ca9 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoverer.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoverer.java
@@ -20,10 +20,10 @@ import org.eclipse.modisco.infra.discovery.core.exception.DiscoveryException;
 /**

  * A discoverer is a process which discovers information from one input source.

  * Such a process can be parameterized through additional input data.

- * 

+ *

  * <p>

  * A basic implementation is provided in {@link AbstractDiscoverer}.

- * 

+ *

  * <p>

  * In the context of model-driven reverse-engineering, a common category of

  * discoverers is characterized by injecting information into a result model.

@@ -36,10 +36,10 @@ public interface IDiscoverer<T> {
 	 * To determine if the source object can be handled by the discoverer. Each

 	 * discoverer has to implement this method with its own criteria to filter

 	 * the selected object.

-	 * 

+	 *

 	 * <p>

 	 * Some usual implementations are proposed on {@link AbstractDiscoverer}.

-	 * 

+	 *

 	 * @param source

 	 *            the selected object.

 	 * @return <code>true</code> if the selected object is managed by this

@@ -49,12 +49,12 @@ public interface IDiscoverer<T> {
 

 	/**

 	 * Generic method to launch a discovery from a source element.

-	 * 

+	 *

 	 * <p>

 	 * Additional discovery parameters values (input or output) should be

 	 * managed using fields and methods annotated with a {@link Parameter}

 	 * annotation. See the class {@link AbstractDiscoverer} as an example.

-	 * 

+	 *

 	 * @param source

 	 *            the selected object.

 	 * @param monitor

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoveryManager.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoveryManager.java
index e31b16155..a0d15fb21 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoveryManager.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/IDiscoveryManager.java
@@ -29,7 +29,7 @@ public interface IDiscoveryManager {
 	/**

 	 * This method creates a new {@link IDiscoverer} from the

 	 * {@link DiscovererDescription} with the given <code>id</code>.

-	 * 

+	 *

 	 * @return the created {@link IDiscoverer} or <code>null</code> if no

 	 *         {@link DiscovererDescription} was registered with the given

 	 *         <code>id</code>.

@@ -39,7 +39,7 @@ public interface IDiscoveryManager {
 	/**

 	 * This method creates a new {@link IDiscoverer} from the given

 	 * {@link DiscovererDescription}.

-	 * 

+	 *

 	 * @return the created {@link IDiscoverer} or <code>null</code> if it

 	 *         couldn't be created..

 	 */

@@ -50,7 +50,7 @@ public interface IDiscoveryManager {
 	 * accept the "source" parameter value as a discovery source. This method

 	 * basically relies on the

 	 * {@link #isApplicable(DiscovererDescription, Object)} service.

-	 * 

+	 *

 	 * The resulting collection is unmodifiable.

 	 */

 	Collection<DiscovererDescription> getApplicableDiscoverers(Object source);

@@ -65,7 +65,7 @@ public interface IDiscoveryManager {
 	/**

 	 * This method returns all existing instances of registered

 	 * {@link DiscovererDescription}s.

-	 * 

+	 *

 	 * The returned collection is unmodifiable.

 	 */

 	Collection<DiscovererDescription> getDiscoverers();

@@ -91,7 +91,7 @@ public interface IDiscoveryManager {
 	/**

 	 * Retrieve a parameter value for a {@link Discoverer<?>} using the Java

 	 * reflective API.

-	 * 

+	 *

 	 * @param parameter

 	 *            the parameter whose value to get

 	 * @param discoverer

@@ -105,7 +105,7 @@ public interface IDiscoveryManager {
 	/**

 	 * Set a parameter value for a {@link Discoverer<?>} using the Java

 	 * reflective API.

-	 * 

+	 *

 	 * @param parameter

 	 *            the parameter to set

 	 * @param discoverer

@@ -123,7 +123,7 @@ public interface IDiscoveryManager {
 	 * <p>

 	 * This method should be called from a {@link Job}, in order to avoid

 	 * freezing the UI and provide progress and cancellation.

-	 * 

+	 *

 	 * @param discoverer

 	 *            the discoverer to launch

 	 * @param source

@@ -142,7 +142,7 @@ public interface IDiscoveryManager {
 

 	/**

 	 * Whether an initial value is specified for the given parameter

-	 * 

+	 *

 	 * @param parameter

 	 *            the parameter

 	 * @param discoverer

@@ -155,7 +155,7 @@ public interface IDiscoveryManager {
 	/**

 	 * Returns the initial value for the given parameter, or <code>null</code>

 	 * if none.

-	 * 

+	 *

 	 * @param parameter

 	 *            the parameter

 	 * @param discoverer

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/Parameter.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/Parameter.java
index 281ddc72e..46be7ab92 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/Parameter.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/Parameter.java
@@ -19,24 +19,24 @@ import java.lang.annotation.Target;
 import org.eclipse.modisco.infra.discovery.core.IDiscoverer;

 

 /**

- * 

+ *

  * The Parameter annotation describes some informations needed to characterize

  * inputs and outputs for discoverers ({@link IDiscoverer})

- * 

+ *

  * The developer is free to annotate directly a Java field or a getter/setter

  * method, or both field and getter/setter with a same id.

- * 

+ *

  * An input data is supposed to be valued before a discovery is launched : At

  * least a setter method (preferred) or a public field (discouraged) must be

  * proposed.

- * 

+ *

  * An output data is supposed to be accessed after a discovery treatment : At

  * least a setter method (preferred) or a public field (discouraged) must be

  * proposed.

- * 

+ *

  * A data both input and output of the discovery must respond to both previous

  * conditions.

- * 

+ *

  * Using the annotation will throw compilation errors in the following cases :

  * <ul>

  * <li>

@@ -57,28 +57,28 @@ import org.eclipse.modisco.infra.discovery.core.IDiscoverer;
  * annotating more than one setter with the same id

  * <li>

  * giving some "required" value on a getter (a getter describes an output data)

- * 

+ *

  * </ul>

- * 

+ *

  */

 @Documented

 @Retention(RetentionPolicy.RUNTIME)

 @Target({ ElementType.METHOD, ElementType.FIELD })

 public @interface Parameter {

 	/**

-	 * 

+	 *

 	 * @return the identifier of the discoverer parameter

 	 */

 	String name();

 

 	/**

-	 * 

+	 *

 	 * @return the optional description of the discoverer parameter

 	 */

 	String description() default "";

 

 	/**

-	 * 

+	 *

 	 * @return <code>true</code> if a value for this discoverer parameter is

 	 *         mandatory to launch the discovery.

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/ParameterInitialValue.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/ParameterInitialValue.java
index 384cf075a..2d242a095 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/ParameterInitialValue.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/annotations/ParameterInitialValue.java
@@ -6,7 +6,7 @@
  * http://www.eclipse.org/legal/epl-v10.html

  *

  * Contributors:

- *    Nicolas Bros (Mia-Software) - Bug 338702 - [Discovery] specify initial value for Parameters 

+ *    Nicolas Bros (Mia-Software) - Bug 338702 - [Discovery] specify initial value for Parameters

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.core.annotations;

 

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/exception/DiscoveryException.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/exception/DiscoveryException.java
index d334d2eed..08cf89169 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/exception/DiscoveryException.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/exception/DiscoveryException.java
@@ -4,7 +4,7 @@
  * 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:

  *     Fabien Giquel (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/Activator.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/Activator.java
index 153f07c5b..80a554acd 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/Activator.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/Activator.java
@@ -19,7 +19,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

@@ -28,7 +28,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext

 	 * )

@@ -41,7 +41,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/DiscoveryManager.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/DiscoveryManager.java
index ff3c7b382..b0025755f 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/DiscoveryManager.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/DiscoveryManager.java
@@ -7,7 +7,7 @@
  *

  * Contributors:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

- *    Nicolas Bros (Mia-Software) - Bug 338702 - [Discovery] specify initial value for Parameters 

+ *    Nicolas Bros (Mia-Software) - Bug 338702 - [Discovery] specify initial value for Parameters

  *******************************************************************************/

 package org.eclipse.modisco.infra.discovery.core.internal;

 

@@ -33,13 +33,13 @@ import org.eclipse.modisco.infra.discovery.core.internal.catalog.DiscovererRegis
 

 /**

  * Registry for accessing {@link IDiscoverer} instances.

- * 

+ *

  */

 public final class DiscoveryManager implements IDiscoveryManager {

 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getDiscoverer(java.lang.String)

 	 */

@@ -53,7 +53,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getDiscoverer

 	 * (org.eclipse.modisco.infra.discovery.catalog.DiscovererDescription)

@@ -64,7 +64,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getApplicableDiscoverers(java.lang.Object)

 	 */

@@ -80,7 +80,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * isApplicable

 	 * (org.eclipse.modisco.infra.discovery.catalog.DiscovererDescription,

@@ -104,7 +104,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getDiscoverers()

 	 */

@@ -114,7 +114,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getDiscovererDescription(java.lang.Class)

 	 */

@@ -131,7 +131,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getDiscovererDescription(java.lang.String)

 	 */

@@ -146,7 +146,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * getDiscovererDescription

 	 * (org.eclipse.modisco.infra.discovery.core.IDiscoverer)

@@ -191,7 +191,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * canRetrieveValue

 	 * (org.eclipse.modisco.infra.discovery.catalog.DiscovererParameter)

@@ -208,7 +208,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#getValue

 	 * (org.eclipse.modisco.infra.discovery.catalog.DiscovererParameter,

@@ -245,7 +245,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#setValue

 	 * (org.eclipse.modisco.infra.discovery.catalog.DiscovererParameter,

@@ -280,7 +280,7 @@ public final class DiscoveryManager implements IDiscoveryManager {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.modisco.infra.discovery.core.catalog.IDiscoveryManager#

 	 * discoverElement(org.eclipse.modisco.infra.discovery.core.IDiscoverer,

 	 * java.lang.Object, java.util.Map)

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/annotations/DiscoveryAnnotationControls.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/annotations/DiscoveryAnnotationControls.java
index 97eba5111..823392048 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/annotations/DiscoveryAnnotationControls.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/annotations/DiscoveryAnnotationControls.java
@@ -124,7 +124,7 @@ public final class DiscoveryAnnotationControls {
 	/**

 	 * Only one parameter memberDeclaration or member is not null. The service

 	 * implements the same controls with two Java reflexive API.

-	 * 

+	 *

 	 * @param parameterAnnotation

 	 * @param methodDeclaration

 	 * @param method

@@ -164,7 +164,7 @@ public final class DiscoveryAnnotationControls {
 	/**

 	 * Only one parameter memberDeclaration or member is not null. The service

 	 * implements the same controls with two Java reflexive API.

-	 * 

+	 *

 	 * @param parameterAnnotation

 	 * @param memberDeclaration

 	 * @param member

@@ -204,7 +204,7 @@ public final class DiscoveryAnnotationControls {
 	/**

 	 * Only one parameter memberDeclaration or member is not null. The service

 	 * implements the same controls with two Java reflexive API.

-	 * 

+	 *

 	 * @param parameterAnnotation

 	 * @param memberDeclaration

 	 * @param member

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererParameterUtils.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererParameterUtils.java
index dbbe497ec..80488d082 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererParameterUtils.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererParameterUtils.java
@@ -50,7 +50,7 @@ public final class DiscovererParameterUtils {
 	/**

 	 * This method computes the parameters description for one discoverer

 	 * implementation

-	 * 

+	 *

 	 */

 	public void computeParameters(final DiscovererDescription discovererDescription) {

 		// (discoverer parameter ID, (class field or method, Parameter

diff --git a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererRegistry.java b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererRegistry.java
index 1acdedeea..3da1b0e63 100644
--- a/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererRegistry.java
+++ b/org.eclipse.modisco.infra.discovery.core/src/org/eclipse/modisco/infra/discovery/core/internal/catalog/DiscovererRegistry.java
@@ -159,7 +159,7 @@ public final class DiscovererRegistry {
 	 * Computes an uri for main resource. The resource is build at runtime and

 	 * does not need a serialization. However the created uri will prepare for a

 	 * future serialization in workspace metadatas if needed.

-	 * 

+	 *

 	 * @return

 	 */

 	private static URI getDiscoverersResourceURI() {

@@ -171,7 +171,7 @@ public final class DiscovererRegistry {
 	/**

 	 * This method computes at runtime the source type argument for one

 	 * discoverer implementation (generic T type)

-	 * 

+	 *

 	 */

 	private static void computeSourceType(final DiscovererDescription discovererDescription) {

 		Class<?> sourceType = null;

diff --git a/org.eclipse.modisco.infra.discovery.ui/.checkstyle b/org.eclipse.modisco.infra.discovery.ui/.checkstyle
index ccddd5241..e2c831c76 100644
--- a/org.eclipse.modisco.infra.discovery.ui/.checkstyle
+++ b/org.eclipse.modisco.infra.discovery.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java
index 157b08886..d03898144 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/Activator.java
@@ -26,7 +26,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

@@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -48,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -61,17 +61,17 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

 		return Activator.plugin;

 	}

-	

+

 	/**

 	 * Returns an image descriptor for the image file at the given plug-in

 	 * relative path

-	 * 

+	 *

 	 * @param path

 	 *            the path

 	 * @return the image descriptor

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/ContributionItemForMoDiscoMenu.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/ContributionItemForMoDiscoMenu.java
index 65917f0c3..a10a7048d 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/ContributionItemForMoDiscoMenu.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/ContributionItemForMoDiscoMenu.java
@@ -79,11 +79,11 @@ public class ContributionItemForMoDiscoMenu extends ContributionItem implements
 					/*

 					 * Items and sub-menus will only be available if they match

 					 * selected resources.

-					 * 

+					 *

 					 * First, retrieve selected resource

-					 * 

+					 *

 					 * Second, check if available discoverers handle it

-					 * 

+					 *

 					 * Third, if discoverers list is not empty, we will create a

 					 * menu item for each. For each menu item, we have to link

 					 * menu action to menu event like usual menu.

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/MoDiscoMenuSelectionListener.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/MoDiscoMenuSelectionListener.java
index 16ef796e5..9a30658d3 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/MoDiscoMenuSelectionListener.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/actions/MoDiscoMenuSelectionListener.java
@@ -49,7 +49,7 @@ public class MoDiscoMenuSelectionListener implements SelectionListener {
 	private final Object[] fSources;

 	private final Shell shell;

 	private final LaunchConfigurationUtils lcUtils;

-	

+

 	public MoDiscoMenuSelectionListener(final DiscovererDescription discoverer,

 			final Object[] sourceParameter, final Shell shell) {

 		this.fDiscovererDesc = discoverer;

@@ -60,7 +60,7 @@ public class MoDiscoMenuSelectionListener implements SelectionListener {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse

 	 * .swt.events.SelectionEvent)

@@ -93,14 +93,14 @@ public class MoDiscoMenuSelectionListener implements SelectionListener {
 			return this.cancelled;

 		}

 	}

-	

-	

+

+

 	/**

 	 * Open a dialog box to let the user enter parameter values.

-	 * 

+	 *

 	 * @param discoverer

 	 * @param source

-	 * 

+	 *

 	 * @return a map of (param, value), or <code>null</code> if cancelled by the

 	 *         user

 	 */

@@ -132,12 +132,12 @@ public class MoDiscoMenuSelectionListener implements SelectionListener {
 		return new ParamsDialogResult(null, false, true);

 	}

 

-	

-	

-	

+

+

+

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt

 	 * .events.SelectionEvent)

@@ -256,7 +256,7 @@ public class MoDiscoMenuSelectionListener implements SelectionListener {
 			final DiscovererDescription discoverer) {

 		return LaunchConfigurationUtils.getExpectedInputParameters(discoverer);

 	}

-	

+

 

 

 }

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/GenericParametersDialog.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/GenericParametersDialog.java
index 072bb2a8b..3a27c7be7 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/GenericParametersDialog.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/dialogs/GenericParametersDialog.java
@@ -64,7 +64,7 @@ public class GenericParametersDialog extends TitleAreaDialog {
 	private static final int TYPE_COLUMN_INDEX = 2;

 	private static final int DIALOG_WIDTH = 725;

 	private static final int DIALOG_HEIGHT = 455;

-	

+

 	private static final int NAME_COLUMN_WIDTH = 150;

 	private static final int VALUE_COLUMN_WIDTH = 250;

 	private static final int TYPE_COLUMN_WIDTH = 250;

@@ -152,7 +152,7 @@ public class GenericParametersDialog extends TitleAreaDialog {
 

 	/**

 	 * Create the dialog.

-	 * 

+	 *

 	 * @param parentShell

 	 * @param parameters

 	 * @param discovererName

@@ -206,7 +206,7 @@ public class GenericParametersDialog extends TitleAreaDialog {
 

 	/**

 	 * Create the contents of the dialog.

-	 * 

+	 *

 	 * @param parent

 	 */

 	@Override

@@ -236,7 +236,7 @@ public class GenericParametersDialog extends TitleAreaDialog {
 

 		return container;

 	}

-	

+

 	private void createParametersTable(final Composite container) {

 		this.tableViewerParameters = new TableViewer(container, SWT.MULTI | SWT.BORDER

 				| SWT.FULL_SELECTION);

@@ -353,7 +353,7 @@ public class GenericParametersDialog extends TitleAreaDialog {
 

 	/**

 	 * Create contents of the button bar.

-	 * 

+	 *

 	 * @param parent

 	 */

 	@Override

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscovererLaunchConfigurationDelegate.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscovererLaunchConfigurationDelegate.java
index 16c46017c..a90e9cd3d 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscovererLaunchConfigurationDelegate.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscovererLaunchConfigurationDelegate.java
@@ -44,7 +44,7 @@ public class DiscovererLaunchConfigurationDelegate implements ILaunchConfigurati
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.core.model.ILaunchConfigurationDelegate#launch(org.

 	 * eclipse.debug.core.ILaunchConfiguration, java.lang.String,

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java
index dbe59b418..dbcced424 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersMainTab.java
@@ -126,7 +126,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 	/**

 	 * This method initializes or re-initializes the source Group depending on

 	 * the selected discoverer.

-	 * 

+	 *

 	 * @param discovererDescription

 	 *            the selected discoverer (<code>null</code> if none)

 	 */

@@ -178,7 +178,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 		// close the parameter cell editors

 		this.parametersContainer.getInParametersGroup().getTableViewer().cancelEditing();

 		this.parametersContainer.getInoutParametersGroup().getTableViewer().cancelEditing();

-			

+

 		// the source changed : since the initialValue can depend on the source,

 		// initialize all parameters again

 		for (DiscovererParameterDisplay parameter : this.displayParameters) {

@@ -189,7 +189,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/**

 	 * This method initializes discovererKindGroup

-	 * 

+	 *

 	 */

 	private final void createDiscovererKindGroup() {

 		GridData gridData11 = new GridData();

@@ -255,7 +255,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse

 	 * .swt.widgets.Composite)

@@ -292,7 +292,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()

 	 */

 	public String getName() {

@@ -301,7 +301,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse

 	 * .debug.core.ILaunchConfiguration)

@@ -321,7 +321,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 		if (this.sourceCellEditorComposite != null && !this.sourceCellEditorComposite.isDisposed()) {

 			this.sourceCellEditorComposite.setValue(source);

 		}

-		

+

 		updateDiscovererParametersContainer(configurationModel);

 		this.checkboxOpenModel.setSelection(configurationModel.isOpenModelAfterDiscovery());

 

@@ -330,7 +330,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse

 	 * .debug.core.ILaunchConfigurationWorkingCopy)

@@ -361,7 +361,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.

 	 * debug.core.ILaunchConfigurationWorkingCopy)

@@ -372,7 +372,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse

 	 * .debug.core.ILaunchConfiguration)

@@ -409,7 +409,7 @@ public class DiscoverersMainTab extends AbstractLaunchConfigurationTab implement
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.modisco.infra.discoverymanager.ui.launch.DiscovererUpdate

 	 * #update()

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersTabGroup.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersTabGroup.java
index 4a3ca834f..1ef66ab9e 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersTabGroup.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/DiscoverersTabGroup.java
@@ -21,7 +21,7 @@ public class DiscoverersTabGroup extends AbstractLaunchConfigurationTabGroup {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse

 	 * .debug.ui.ILaunchConfigurationDialog, java.lang.String)

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/data/DiscovererParameterDisplay.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/data/DiscovererParameterDisplay.java
index d05a44ee3..4f00c025f 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/data/DiscovererParameterDisplay.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/data/DiscovererParameterDisplay.java
@@ -16,27 +16,27 @@ import org.eclipse.modisco.infra.discovery.catalog.DiscovererParameter;
 

 public interface DiscovererParameterDisplay {

 	/**

-	 * 

+	 *

 	 * @return the value associated to this discoverer parameter.

 	 */

 	public Object getValue();

 

 	/**

 	 * To initialize the value of the discoverer parameter.

-	 * 

+	 *

 	 * @param value

 	 */

 	public void setValue(Object value);

 

 	/**

-	 * 

+	 *

 	 * @return the associated discoverer parameter description

 	 */

 	public DiscovererParameter getParameterDescription();

 

 	/**

 	 * Initialize the parameter with an initial value.

-	 * 

+	 *

 	 * @param source

 	 *            the source of the discovery

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/DiscovererParametersComposite.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/DiscovererParametersComposite.java
index 599a3f9f5..a4eef4a08 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/DiscovererParametersComposite.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/DiscovererParametersComposite.java
@@ -42,7 +42,7 @@ public class DiscovererParametersComposite extends Composite {
 

 		/**

 		 * This method initializes inParametersGroup

-		 * 

+		 *

 		 */

 		void createParametersGroup(final ExpandBar parametersBar,

 				final List<DiscovererParameterDisplay> discoveryParameters, final String message,

@@ -103,7 +103,7 @@ public class DiscovererParametersComposite extends Composite {
 

 	/**

 	 * This method initializes discovererParametersGroup

-	 * 

+	 *

 	 */

 	private final void createDiscovererParametersGroup() {

 		GridData gridData1 = new GridData();

@@ -135,7 +135,7 @@ public class DiscovererParametersComposite extends Composite {
 

 	/**

 	 * This method initializes inParametersGroup

-	 * 

+	 *

 	 */

 	private final void createInParametersGroup() {

 		this.inParametersGroup = new InnerParametersGroup();

@@ -155,7 +155,7 @@ public class DiscovererParametersComposite extends Composite {
 

 	/**

 	 * This method initializes inoutParametersGroup

-	 * 

+	 *

 	 */

 	private final void createInoutParametersGroup() {

 		this.inoutParametersGroup = new InnerParametersGroup();

@@ -176,7 +176,7 @@ public class DiscovererParametersComposite extends Composite {
 

 	/**

 	 * This method initializes outParametersGroup

-	 * 

+	 *

 	 */

 	private final void createOutParametersGroup() {

 		this.outParametersGroup = new InnerParametersGroup();

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableContentProvider.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableContentProvider.java
index bdc55e8d5..521839b10 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableContentProvider.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/parametersdisplay/ParametersTableContentProvider.java
@@ -20,7 +20,7 @@ public class ParametersTableContentProvider implements IStructuredContentProvide
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()

 	 */

 	public void dispose() {

@@ -29,7 +29,7 @@ public class ParametersTableContentProvider implements IStructuredContentProvide
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface

 	 * .viewers.Viewer, java.lang.Object, java.lang.Object)

@@ -40,7 +40,7 @@ public class ParametersTableContentProvider implements IStructuredContentProvide
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java

 	 * .lang.Object)

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/utils/LaunchConfigUtils.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/utils/LaunchConfigUtils.java
index 2c7772e37..ab1ed9dee 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/utils/LaunchConfigUtils.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/launch/utils/LaunchConfigUtils.java
@@ -29,7 +29,7 @@ import org.eclipse.modisco.infra.discovery.ui.internal.util.LaunchModelUtils;
 /**

  * This class manages the serialization of a discovery launch model into one

  * {@link ILaunchConfiguration}.

- * 

+ *

  */

 public final class LaunchConfigUtils {

 

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/registry/DiscovererUIRegistry.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/registry/DiscovererUIRegistry.java
index 7361f5768..8f93317ce 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/registry/DiscovererUIRegistry.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/registry/DiscovererUIRegistry.java
@@ -57,10 +57,10 @@ public class DiscovererUIRegistry extends AbstractRegistry {
 	/**

 	 * Query the discoverers UI registry for a {@link DiscovererUI} for the

 	 * discoverer with the given name.

-	 * 

+	 *

 	 * @param name

 	 *            the name of the {@link DiscovererUI} that is looked for

-	 * 

+	 *

 	 * @return the {@link DiscovererUI} or <code>null</code> if none was found

 	 *         with the given name

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchConfigurationUtils.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchConfigurationUtils.java
index 84e237b5a..cdbe0b3f0 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchConfigurationUtils.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchConfigurationUtils.java
@@ -161,7 +161,7 @@ public class LaunchConfigurationUtils {
 		}

 		return iresource;

 	}

-	

+

 	public static List<DiscovererParameter> getExpectedInputParameters(

 			final DiscovererDescription discoverer) {

 		List<DiscovererParameter> inParameters = new ArrayList<DiscovererParameter>();

@@ -174,9 +174,9 @@ public class LaunchConfigurationUtils {
 		}

 		return inParameters;

 	}

-	

+

 	public DiscovererDescription getDiscoverer() {

 		return this.fDiscovererDesc;

 	}

-	

+

 }

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchModelUtils.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchModelUtils.java
index 29fa0dc70..9e6547fea 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchModelUtils.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/LaunchModelUtils.java
@@ -88,7 +88,7 @@ public final class LaunchModelUtils {
 

 	/**

 	 * Validate the given {@link LaunchConfiguration}.

-	 * 

+	 *

 	 * @return <code>null</code> if OK, or a localized String indicating the

 	 *         error.

 	 */

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/ModelUtils.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/ModelUtils.java
index 350be30a8..33ae318ae 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/ModelUtils.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/util/ModelUtils.java
@@ -30,7 +30,7 @@ import org.eclipse.ui.ide.IDE;
 import org.eclipse.ui.part.FileEditorInput;

 

 public final class ModelUtils {

-	

+

 	private ModelUtils() {

 		//

 	}

@@ -38,7 +38,7 @@ public final class ModelUtils {
 	/**

 	 * A utility service for opening a model in the MoDisco model editor, if

 	 * present, or otherwise in another appropriate editor.

-	 * 

+	 *

 	 * @param source

 	 *            a {@link Resource} instance

 	 */

@@ -53,7 +53,7 @@ public final class ModelUtils {
 

 	/**

 	 * A utility service for opening a model in the MoDisco model editor.

-	 * 

+	 *

 	 * @param model

 	 *            a {@link Resource} instance

 	 */

@@ -78,7 +78,7 @@ public final class ModelUtils {
 	 * A utility service to schedule the opening of a model in the MoDisco model

 	 * editor, if present, or otherwise in another appropriate editor. This

 	 * service reuses {@link #openEditor(IFile)}.

-	 * 

+	 *

 	 * @param source

 	 *            a {@link Resource} instance

 	 * @param job

@@ -99,7 +99,7 @@ public final class ModelUtils {
 	/**

 	 * A utility service to schedule the opening of a model in the MoDisco model

 	 * editor. This service reuses {@link #openEditor(Resource)}.

-	 * 

+	 *

 	 * @param source

 	 *            a {@link Resource} instance

 	 * @param job

diff --git a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/wizards/NewDiscovererMainWizardPage.java b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/wizards/NewDiscovererMainWizardPage.java
index 2dd2d07ca..40d29e9e3 100644
--- a/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/wizards/NewDiscovererMainWizardPage.java
+++ b/org.eclipse.modisco.infra.discovery.ui/src/org/eclipse/modisco/infra/discovery/ui/internal/wizards/NewDiscovererMainWizardPage.java
@@ -213,7 +213,7 @@ public class NewDiscovererMainWizardPage extends NewTypeWizardPage {
 

 	/**

 	 * Create contents of the wizard.

-	 * 

+	 *

 	 * @param parent

 	 */

 	public void createControl(final Composite parent) {

@@ -298,7 +298,7 @@ public class NewDiscovererMainWizardPage extends NewTypeWizardPage {
 	private static void spacer(final Composite container) {

 		new Label(container, SWT.NONE);

 	}

-	

+

 	private static final int PARAMETER_TABLE_HEIGHT = 120;

 	private static final int NAME_COLUMN_WIDTH = 85;

 	private static final int TYPE_COLUMN_WIDTH = 85;

@@ -754,7 +754,7 @@ public class NewDiscovererMainWizardPage extends NewTypeWizardPage {
 		buf.append("protected void basicDiscoverElement(final ").append(inputType).append(" source, final ").append(progressMonitor).append(" monitor) throws ").append(discoveryException).append(" {").append(lineDelimiter); //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

 		final String basicDiscoverElementBodyContent = CodeGeneration.getMethodBodyContent(

 				type.getCompilationUnit(), type.getTypeQualifiedName('.'),

-				"basicDiscoverElement", false, "", lineDelimiter); //$NON-NLS-1$ //$NON-NLS-2$ 

+				"basicDiscoverElement", false, "", lineDelimiter); //$NON-NLS-1$ //$NON-NLS-2$

 		if (basicDiscoverElementBodyContent != null

 				&& basicDiscoverElementBodyContent.length() != 0) {

 			buf.append(basicDiscoverElementBodyContent);

diff --git a/org.eclipse.modisco.infra.discovery/.checkstyle b/org.eclipse.modisco.infra.discovery/.checkstyle
index 390eb9940..175c48416 100644
--- a/org.eclipse.modisco.infra.discovery/.checkstyle
+++ b/org.eclipse.modisco.infra.discovery/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-Copyright (c) 2010 Mia-Software.
+Copyright (c) 2010, 2018 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
@@ -8,11 +8,15 @@ http://www.eclipse.org/legal/epl-v10.html
 
 Contributors:
     Nicolas Bros (Mia-Software) - initial API and implementation
+    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings
 -->
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
   </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.infra.discovery/.classpath b/org.eclipse.modisco.infra.discovery/.classpath
index 45f024e85..afb9bb46e 100644
--- a/org.eclipse.modisco.infra.discovery/.classpath
+++ b/org.eclipse.modisco.infra.discovery/.classpath
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="src" path="src"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

diff --git a/org.eclipse.modisco.infra.discovery/build.properties b/org.eclipse.modisco.infra.discovery/build.properties
index 26af83b93..9fcaa1dda 100644
--- a/org.eclipse.modisco.infra.discovery/build.properties
+++ b/org.eclipse.modisco.infra.discovery/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2011 Mia-Software.

+# Copyright (c) 2011, 2018 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

@@ -6,6 +6,7 @@
 # 

 # Contributors:

 #     Fabien Giquel (Mia-Software) - design and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # 

 

 bin.includes = .,\

@@ -16,6 +17,7 @@ bin.includes = .,\
                about.html,\

                OSGI-INF/

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/,\

+           src/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.infra.discovery/model/discovery.genmodel b/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
index d99bd1018..3e4030a0e 100644
--- a/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
+++ b/org.eclipse.modisco.infra.discovery/model/discovery.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2011 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;    Fabien Giquel (Mia-Software) - design and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.modisco.infra.discovery/src" modelPluginID="org.eclipse.modisco.infra.discovery"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2018 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;    Fabien Giquel (Mia-Software) - design and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.modisco.infra.discovery/src-gen" modelPluginID="org.eclipse.modisco.infra.discovery"

     modelName="Discovery" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" runtimeVersion="2.6" usedGenPackages="platform:/plugin/org.eclipse.emf.facet.util.emf.catalog/model/catalog.genmodel#//catalog ../../org.eclipse.emf.facet.util.emf.core/model/serialization.genmodel#//serialization">

   <foreignModel>discovery.ecore</foreignModel>

diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/CatalogFactory.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/CatalogFactory.java
index 1d2b5402d..1d2b5402d 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/CatalogFactory.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/CatalogFactory.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/CatalogPackage.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/CatalogPackage.java
index a6c2b03c1..a6c2b03c1 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/CatalogPackage.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/CatalogPackage.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DirectionKind.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DirectionKind.java
index f4e2d4b7c..f4e2d4b7c 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DirectionKind.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DirectionKind.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DiscovererCatalog.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DiscovererCatalog.java
index 652326154..652326154 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DiscovererCatalog.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DiscovererCatalog.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DiscovererDescription.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DiscovererDescription.java
index f57f2f7a2..f57f2f7a2 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DiscovererDescription.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DiscovererDescription.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DiscovererParameter.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DiscovererParameter.java
index e65084564..e65084564 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/DiscovererParameter.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/DiscovererParameter.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogFactoryImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogFactoryImpl.java
index a2a172b8b..a2a172b8b 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogFactoryImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogFactoryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogPackageImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogPackageImpl.java
index 45d882435..45d882435 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogPackageImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/CatalogPackageImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererCatalogImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererCatalogImpl.java
index 22e056f02..22e056f02 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererCatalogImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererCatalogImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererDescriptionImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererDescriptionImpl.java
index b1dfc081c..b1dfc081c 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererDescriptionImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererDescriptionImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererParameterImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererParameterImpl.java
index 60a4ea968..60a4ea968 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererParameterImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/impl/DiscovererParameterImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/util/CatalogAdapterFactory.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/util/CatalogAdapterFactory.java
index 24d3d6a33..24d3d6a33 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/util/CatalogAdapterFactory.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/util/CatalogAdapterFactory.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/util/CatalogSwitch.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/util/CatalogSwitch.java
index e7fd69c5e..e7fd69c5e 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/catalog/util/CatalogSwitch.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/catalog/util/CatalogSwitch.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java
index 1ce01d764..1ce01d764 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchConfiguration.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/LaunchFactory.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchFactory.java
index 325c9d3c6..325c9d3c6 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/LaunchFactory.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchFactory.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/LaunchPackage.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchPackage.java
index 313c02a88..313c02a88 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/LaunchPackage.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/LaunchPackage.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java
index 19cbd5e0c..19cbd5e0c 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/ParameterValue.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/LaunchConfigurationImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/LaunchConfigurationImpl.java
index 05499e267..05499e267 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/LaunchConfigurationImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/LaunchConfigurationImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/LaunchFactoryImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/LaunchFactoryImpl.java
index d534dff74..d534dff74 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/LaunchFactoryImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/LaunchFactoryImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/LaunchPackageImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/LaunchPackageImpl.java
index 58830ba3d..58830ba3d 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/LaunchPackageImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/LaunchPackageImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/ParameterValueImpl.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/ParameterValueImpl.java
index a34468e77..a34468e77 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/impl/ParameterValueImpl.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/impl/ParameterValueImpl.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/util/LaunchAdapterFactory.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/util/LaunchAdapterFactory.java
index 8230404eb..8230404eb 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/util/LaunchAdapterFactory.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/util/LaunchAdapterFactory.java
diff --git a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/util/LaunchSwitch.java b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/util/LaunchSwitch.java
index 2ddd2958f..2ddd2958f 100644
--- a/org.eclipse.modisco.infra.discovery/src/org/eclipse/modisco/infra/discovery/launch/util/LaunchSwitch.java
+++ b/org.eclipse.modisco.infra.discovery/src-gen/org/eclipse/modisco/infra/discovery/launch/util/LaunchSwitch.java
diff --git a/org.eclipse.modisco.infra.doc.tests/src/org/eclipse/modisco/infra/doc/tests/Activator.java b/org.eclipse.modisco.infra.doc.tests/src/org/eclipse/modisco/infra/doc/tests/Activator.java
index 8e38a398f..d53232cb5 100644
--- a/org.eclipse.modisco.infra.doc.tests/src/org/eclipse/modisco/infra/doc/tests/Activator.java
+++ b/org.eclipse.modisco.infra.doc.tests/src/org/eclipse/modisco/infra/doc/tests/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends Plugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.infra.facet.tests/.checkstyle b/org.eclipse.modisco.infra.facet.tests/.checkstyle
index 2b616f59c..699104fb8 100644
--- a/org.eclipse.modisco.infra.facet.tests/.checkstyle
+++ b/org.eclipse.modisco.infra.facet.tests/.checkstyle
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/infra/facet/tests/emf"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.infra.facet.tests/.classpath b/org.eclipse.modisco.infra.facet.tests/.classpath
index 45f024e85..e5fbd3dd2 100644
--- a/org.eclipse.modisco.infra.facet.tests/.classpath
+++ b/org.eclipse.modisco.infra.facet.tests/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.infra.facet.tests/build.properties b/org.eclipse.modisco.infra.facet.tests/build.properties
index 1aa069cad..6bc62697a 100644
--- a/org.eclipse.modisco.infra.facet.tests/build.properties
+++ b/org.eclipse.modisco.infra.facet.tests/build.properties
@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	  Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 bin.includes = .,\

                META-INF/,\

@@ -18,6 +19,7 @@ bin.includes = .,\
                plugin.xml,\

                src/Bug311684.java

 jars.compile.order = .

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetAllTests.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetAllTests.java
index d6eb25a6a..d6eb25a6a 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetAllTests.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetAllTests.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetAttributeTest.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetAttributeTest.java
index 4f6a45fa0..4f6a45fa0 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetAttributeTest.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetAttributeTest.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetExample.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetExample.java
index f358276b9..f358276b9 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetExample.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetExample.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetReferenceTest.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetReferenceTest.java
index 1925ace9d..1925ace9d 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetReferenceTest.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetReferenceTest.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetSetTest.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetSetTest.java
index 12e4d7d59..12e4d7d59 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetSetTest.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetSetTest.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetStructuralFeatureTest.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetStructuralFeatureTest.java
index 5d7578dfd..5d7578dfd 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetStructuralFeatureTest.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetStructuralFeatureTest.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetTest.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetTest.java
index 1ddb16a68..1ddb16a68 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetTest.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetTest.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetTests.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetTests.java
index f173d8b0e..f173d8b0e 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/FacetTests.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/FacetTests.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/ShortcutTest.java b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/ShortcutTest.java
index c1fbe41b4..c1fbe41b4 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/ShortcutTest.java
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/ShortcutTest.java
diff --git a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/messages.properties b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/messages.properties
index 00c824d7f..00c824d7f 100644
--- a/org.eclipse.modisco.infra.facet.tests/src/org/eclipse/modisco/infra/facet/tests/emf/messages.properties
+++ b/org.eclipse.modisco.infra.facet.tests/src-gen/org/eclipse/modisco/infra/facet/tests/emf/messages.properties
diff --git a/org.eclipse.modisco.infra.query.tests/.checkstyle b/org.eclipse.modisco.infra.query.tests/.checkstyle
index 038cc7228..699104fb8 100644
--- a/org.eclipse.modisco.infra.query.tests/.checkstyle
+++ b/org.eclipse.modisco.infra.query.tests/.checkstyle
@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/infra/query/runtime/emf/tests"/>
-    <filter-data value="src/org/eclipse/modisco/infra/query/tests/emf"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.infra.query.tests/.classpath b/org.eclipse.modisco.infra.query.tests/.classpath
index 2d1a4302f..ed2585fb3 100644
--- a/org.eclipse.modisco.infra.query.tests/.classpath
+++ b/org.eclipse.modisco.infra.query.tests/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/org.eclipse.modisco.infra.query.tests/build.properties b/org.eclipse.modisco.infra.query.tests/build.properties
index 4efb7a040..d79a78bcf 100644
--- a/org.eclipse.modisco.infra.query.tests/build.properties
+++ b/org.eclipse.modisco.infra.query.tests/build.properties
@@ -7,8 +7,10 @@
 #

 # Contributors:

 #    Gregoire DUPE (Mia-Software) - initial API and implementation

+#	  Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 bin.includes = META-INF/,\

                .,\

diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/Messages.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/Messages.java
index bc8e78e72..bc8e78e72 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/Messages.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/Messages.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryContextTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryContextTest.java
index d6febf43f..d6febf43f 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryContextTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryContextTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryParameterValueTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryParameterValueTest.java
index b01f5e209..b01f5e209 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryParameterValueTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryParameterValueTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryResultTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryResultTest.java
index 7bf3e7ad0..7bf3e7ad0 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryResultTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/ModelQueryResultTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeExample.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeExample.java
index 5eb76b310..5eb76b310 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeExample.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeExample.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeTests.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeTests.java
index c6ac9eaad..c6ac9eaad 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeTests.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/RuntimeTests.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/messages.properties b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/messages.properties
index dd18c62d6..dd18c62d6 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/runtime/emf/tests/messages.properties
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/runtime/emf/tests/messages.properties
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/JavaModelQueryTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/JavaModelQueryTest.java
index 65afcff85..65afcff85 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/JavaModelQueryTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/JavaModelQueryTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/Messages.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/Messages.java
index 27382d703..27382d703 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/Messages.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/Messages.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/ModelQueryParameterTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/ModelQueryParameterTest.java
index 4f6bb530f..4f6bb530f 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/ModelQueryParameterTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/ModelQueryParameterTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/ModelQuerySetTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/ModelQuerySetTest.java
index cb17d85ec..cb17d85ec 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/ModelQuerySetTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/ModelQuerySetTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/ModelQueryTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/ModelQueryTest.java
index a7ddf0227..a7ddf0227 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/ModelQueryTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/ModelQueryTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/OCLModelQueryTest.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/OCLModelQueryTest.java
index 05a906706..05a906706 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/OCLModelQueryTest.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/OCLModelQueryTest.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/QueryAllTests.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/QueryAllTests.java
index 8f4ce2d70..8f4ce2d70 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/QueryAllTests.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/QueryAllTests.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/QueryExample.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/QueryExample.java
index 1255935b8..1255935b8 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/QueryExample.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/QueryExample.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/QueryTests.java b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/QueryTests.java
index 503e49f7b..503e49f7b 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/QueryTests.java
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/QueryTests.java
diff --git a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/messages.properties b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/messages.properties
index 9c502b0ab..9c502b0ab 100644
--- a/org.eclipse.modisco.infra.query.tests/src/org/eclipse/modisco/infra/query/tests/emf/messages.properties
+++ b/org.eclipse.modisco.infra.query.tests/src-gen/org/eclipse/modisco/infra/query/tests/emf/messages.properties
diff --git a/org.eclipse.modisco.java.browser.customization.tests/.checkstyle b/org.eclipse.modisco.java.browser.customization.tests/.checkstyle
index 90fa93179..f0517a190 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/.checkstyle
+++ b/org.eclipse.modisco.java.browser.customization.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java
index b702eba66..feb183fa4 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java
+++ b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java
index a33ff74e6..593c1dbbd 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java
+++ b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/Tests.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/TestsJunit3.java b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/TestsJunit3.java
index 3f84c6d8e..04802504c 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/TestsJunit3.java
+++ b/org.eclipse.modisco.java.browser.customization.tests/src/org/eclipse/modisco/java/browser/customization/test/TestsJunit3.java
@@ -4,7 +4,7 @@
  * 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:
  *     Gregoire DUPE (Mia-Software) - initial API and implementation
  *******************************************************************************/
@@ -18,7 +18,7 @@ import junit.framework.TestSuite;
 * @generated
 */
 public class TestsJunit3 extends TestCase {
-	
+
 	/**
 	* @generated
 	*/
@@ -29,7 +29,7 @@ public class TestsJunit3 extends TestCase {
 		return suite;
 	}
 
-		
+
 /**
 * @generated
 */
@@ -38,7 +38,7 @@ public void testjavaTypesCustomizationFacetTest() throws Exception {
 	test.javaTypesCustomizationFacetTest();
 }
 
-	
-	
+
+
 }
 
diff --git a/org.eclipse.modisco.java.composition.browser.customization/.checkstyle b/org.eclipse.modisco.java.composition.browser.customization/.checkstyle
index 76d3f9035..e69aca1c1 100644
--- a/org.eclipse.modisco.java.composition.browser.customization/.checkstyle
+++ b/org.eclipse.modisco.java.composition.browser.customization/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/Activator.java b/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/Activator.java
index 9f7a8fb47..86b88408b 100644
--- a/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/Activator.java
+++ b/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/Activator.java
@@ -4,10 +4,10 @@
  *  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:

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

- * 

+ *

  */

 package org.eclipse.modisco.java.composition.browser.customization;

 

@@ -37,7 +37,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/queries/GetJavaNodeSourceRegionName.java b/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/queries/GetJavaNodeSourceRegionName.java
index e5fb51b0e..ebc37ccc4 100644
--- a/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/queries/GetJavaNodeSourceRegionName.java
+++ b/org.eclipse.modisco.java.composition.browser.customization/src/org/eclipse/modisco/java/composition/browser/customization/queries/GetJavaNodeSourceRegionName.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/.checkstyle b/org.eclipse.modisco.java.composition.discoverer.benchmark/.checkstyle
index 76a672d8c..f798aeebc 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/.checkstyle
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 

 <fileset-config file-format-version="1.2.0" simple-config="true">

-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">

+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">

     <additional-data name="protect-config-file" value="false"/>

   </local-check-config>

   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Activator.java b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Activator.java
index 8687dbf03..dca50a5ee 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Activator.java
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/Activator.java
@@ -4,9 +4,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  ********************************************************************************/

 package org.eclipse.modisco.java.composition.discoverer.benchmark;

@@ -27,7 +27,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -40,7 +40,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -53,7 +53,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/DiscoverJavaApplicationModel2.java b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/DiscoverJavaApplicationModel2.java
index fd9d631f5..0ac069136 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/DiscoverJavaApplicationModel2.java
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/src/org/eclipse/modisco/java/composition/discoverer/benchmark/DiscoverJavaApplicationModel2.java
@@ -89,7 +89,7 @@ public class DiscoverJavaApplicationModel2 extends DiscoverKDMSourceAndJavaModel
 					DiscoverJavaModelFromJavaProjectEMFStat.XMX,

 					Runtime.getRuntime().maxMemory()

 							/ DiscoverJavaModelFromJavaProjectEMFStat.MEGA_BYTES

-							/ DiscoverJavaModelFromJavaProjectEMFStat.MEGA_BYTES + "MB"); //$NON-NLS-1$		

+							/ DiscoverJavaModelFromJavaProjectEMFStat.MEGA_BYTES + "MB"); //$NON-NLS-1$

 

 			getStatistics().getProperties().put(DiscoverJavaModelFromJavaProjectEMFStat.MM_VARIANT,

 					"Java Composite"); //$NON-NLS-1$

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/.checkstyle b/org.eclipse.modisco.java.composition.discoverer.tests/.checkstyle
index 76d3f9035..e69aca1c1 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/.checkstyle
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/JUnitPlugin.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/JUnitPlugin.java
index 0c93f8fea..b98bc4160 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/JUnitPlugin.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/JUnitPlugin.java
@@ -34,7 +34,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -47,7 +47,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -60,7 +60,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JUnitPlugin getDefault() {

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/StrategySourceJavaTests.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/StrategySourceJavaTests.java
index 457d14dcb..8ba6b1c0d 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/StrategySourceJavaTests.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/StrategySourceJavaTests.java
@@ -102,7 +102,7 @@ public class StrategySourceJavaTests {
 		 * To be able to test correctly this bug, we need to reload all

 		 * resources in the same resource set, because it is not the case

 		 * actually ... might be a bug.

-		 * 

+		 *

 		 * In java model, we will test every instances of ASTNode which are not

 		 * proxies, to check corresponding source region.

 		 */

diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/TestMemoryUsage.java b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/TestMemoryUsage.java
index bfcacaae2..20d02c848 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/TestMemoryUsage.java
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/src/org/eclipse/modisco/java/composition/discoverer/tests/TestMemoryUsage.java
@@ -105,7 +105,7 @@ public class TestMemoryUsage {
 				Long.toString(this.memoryUsed),

 				Long.toString(TestMemoryUsage.MAX_MEM_AWAITED));

 		Assert.assertTrue(

-				message, 

+				message,

 				this.memoryUsed < TestMemoryUsage.MAX_MEM_AWAITED);

 	}

 

diff --git a/org.eclipse.modisco.java.composition.discoverer.ui/.checkstyle b/org.eclipse.modisco.java.composition.discoverer.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.java.composition.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.java.composition.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.java.composition.discoverer.ui/src/org/eclipse/modisco/java/composition/discoverer/ui/internal/Activator.java b/org.eclipse.modisco.java.composition.discoverer.ui/src/org/eclipse/modisco/java/composition/discoverer/ui/internal/Activator.java
index 5b11c73c1..4b889a1a4 100644
--- a/org.eclipse.modisco.java.composition.discoverer.ui/src/org/eclipse/modisco/java/composition/discoverer/ui/internal/Activator.java
+++ b/org.eclipse.modisco.java.composition.discoverer.ui/src/org/eclipse/modisco/java/composition/discoverer/ui/internal/Activator.java
@@ -22,7 +22,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -35,7 +35,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -48,7 +48,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.composition.discoverer/.checkstyle b/org.eclipse.modisco.java.composition.discoverer/.checkstyle
index 3ef2f258a..7053eff8f 100644
--- a/org.eclipse.modisco.java.composition.discoverer/.checkstyle
+++ b/org.eclipse.modisco.java.composition.discoverer/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java
index e7b1d3265..41e87a5a7 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Activator.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

@@ -28,7 +28,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 

 	/*

 	 * (non-Javadoc)

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromJavaProject.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromJavaProject.java
index 4618cee8c..0d06b6ddb 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromJavaProject.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromJavaProject.java
@@ -18,13 +18,13 @@ import org.eclipse.modisco.java.discoverer.DiscoverJavaModelFromJavaProject;
 import org.eclipse.modisco.java.discoverer.ElementsToAnalyze;

 

 /**

- * 

+ *

  * This Class provides a way of weaving a MoDisco Java Model with a MoDisco KDM Source one. Both

  * models are discovered independently and then read to weave some instances like Archive,

  * Compilation Unit ...

- * 

+ *

  * See Help contents or http://wiki.eclipse.org/MoDisco/Components/Java/Composition

- * 

+ *

  */

 public class DiscoverKDMSourceAndJavaModelFromJavaProject extends

 		AbstractDiscoverKDMSourceAndJavaModel<IJavaProject> {

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java
index b546464ef..33641dc12 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/DiscoverKDMSourceAndJavaModelFromProject.java
@@ -21,13 +21,13 @@ import org.eclipse.modisco.java.discoverer.DiscoverJavaModelFromProject;
 import org.eclipse.modisco.java.discoverer.ElementsToAnalyze;

 

 /**

- * 

+ *

  * This Class provides a way of weaving a MoDisco Java Model with a MoDisco KDM Source one. Both

  * models are discovered independently and then read to weave some instances like Archive,

  * Compilation Unit ...

- * 

+ *

  * See Help contents or http://wiki.eclipse.org/MoDisco/Components/Java/Composition

- * 

+ *

  */

 public class DiscoverKDMSourceAndJavaModelFromProject extends

 		AbstractDiscoverKDMSourceAndJavaModel<IProject> {

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java
index 91341f05a..813748e2c 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/Messages.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

diff --git a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/listeners/JavaCompositionSourceVisitListener.java b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/listeners/JavaCompositionSourceVisitListener.java
index 3b45c2a1e..4b19c527f 100644
--- a/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/listeners/JavaCompositionSourceVisitListener.java
+++ b/org.eclipse.modisco.java.composition.discoverer/src/org/eclipse/modisco/java/composition/discoverer/listeners/JavaCompositionSourceVisitListener.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

@@ -34,10 +34,10 @@ public class JavaCompositionSourceVisitListener implements SourceVisitListener {
 	}

 

 	/**

-	 * 

+	 *

 	 * Each time this method is notified, it creates a JavaNodeSourceRegion with

 	 * the parameters and stores it in the HasMap for further utilization

-	 * 

+	 *

 	 * @param filePath

 	 *            The path of the parent compilation unit

 	 * @param startPosition

@@ -78,7 +78,7 @@ public class JavaCompositionSourceVisitListener implements SourceVisitListener {
 	/**

 	 * This method recursively compute the Node in parameter to find its Java

 	 * Compilation Unit parent.

-	 * 

+	 *

 	 * @param targetNode

 	 *            The Node to find its parent

 	 * @return the parent Compilation Unit Node, or null if no parent

diff --git a/org.eclipse.modisco.java.composition.ui/.checkstyle b/org.eclipse.modisco.java.composition.ui/.checkstyle
index b5f41d501..2c05eb542 100644
--- a/org.eclipse.modisco.java.composition.ui/.checkstyle
+++ b/org.eclipse.modisco.java.composition.ui/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

  <fileset-config file-format-version="1.2.0" simple-config="true">

-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

      <file-match-pattern match-pattern="." include-pattern="true"/>

      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/Activator.java b/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/Activator.java
index 63f19ac83..aa1f73efd 100644
--- a/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/Activator.java
+++ b/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/Activator.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -37,7 +37,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -63,7 +63,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategyRevealingJava.java b/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategyRevealingJava.java
index 2d0d3693a..269d1e4c4 100644
--- a/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategyRevealingJava.java
+++ b/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategyRevealingJava.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

diff --git a/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategySourceJava.java b/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategySourceJava.java
index 250b438b6..602f5a761 100644
--- a/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategySourceJava.java
+++ b/org.eclipse.modisco.java.composition.ui/src/org/eclipse/modisco/java/composition/ui/strategies/StrategySourceJava.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

diff --git a/org.eclipse.modisco.java.composition/.checkstyle b/org.eclipse.modisco.java.composition/.checkstyle
index 7fc832d12..2a57d2d0f 100644
--- a/org.eclipse.modisco.java.composition/.checkstyle
+++ b/org.eclipse.modisco.java.composition/.checkstyle
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/java/composition/javaapplication"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.java.composition/.classpath b/org.eclipse.modisco.java.composition/.classpath
index 45f024e85..e5fbd3dd2 100644
--- a/org.eclipse.modisco.java.composition/.classpath
+++ b/org.eclipse.modisco.java.composition/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.java.composition/build.properties b/org.eclipse.modisco.java.composition/build.properties
index 2bf4d353f..d7b830cd8 100644
--- a/org.eclipse.modisco.java.composition/build.properties
+++ b/org.eclipse.modisco.java.composition/build.properties
@@ -1,3 +1,15 @@
+###############################################################################

+# Copyright (c) 2010, 2018 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:

+#    Fabien Giquel (Mia-Software) - initial API and implementation

+#    Nicolas Guyomar (Mia-Software) - initial API and implementatio

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

+# 

 bin.includes = .,\

                model/,\

                META-INF/,\

@@ -11,4 +23,5 @@ bin.includes = .,\
 output.. = bin/

 jars.compile.order = .

 src.includes = about.html

-source.. = src/

+source.. = src/,\

+           src-gen/

diff --git a/org.eclipse.modisco.java.composition/model/javaApplication.genmodel b/org.eclipse.modisco.java.composition/model/javaApplication.genmodel
index 331c9f524..8e713d2a8 100644
--- a/org.eclipse.modisco.java.composition/model/javaApplication.genmodel
+++ b/org.eclipse.modisco.java.composition/model/javaApplication.genmodel
@@ -1,8 +1,8 @@
 <?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=" Copyright (c) 2010 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;         Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA; &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;"

-    modelDirectory="/org.eclipse.modisco.java.composition/src" modelPluginID="org.eclipse.modisco.java.composition"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText=" Copyright (c) 2010, 2018 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;         Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA; &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;"

+    modelDirectory="/org.eclipse.modisco.java.composition/src-gen" modelPluginID="org.eclipse.modisco.java.composition"

     modelName="JavaApplication" editPluginClass="org.eclipse.modisco.java.composition.javaapplication.provider.JavaApplicationEditPlugin"

     editorPluginClass="org.eclipse.modisco.java.composition.javaapplication.presentation.JavaApplicationEditorPlugin"

     nonNLSMarkers="true" testSuiteClass="org.eclipse.modisco.java.composition.javaapplication.tests.JavaApplicationAllTests"

diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/Java2Directory.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/Java2Directory.java
index 50819dc30..50819dc30 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/Java2Directory.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/Java2Directory.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/Java2File.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/Java2File.java
index 680c4f7c4..680c4f7c4 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/Java2File.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/Java2File.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaApplication.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaApplication.java
index 217172748..217172748 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaApplication.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaApplication.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaJar2File.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaJar2File.java
index 08e82fc2e..08e82fc2e 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaJar2File.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaJar2File.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaNodeSourceRegion.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaNodeSourceRegion.java
index 73f93fcdb..73f93fcdb 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaNodeSourceRegion.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaNodeSourceRegion.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationFactory.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationFactory.java
index 5234414da..5234414da 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationFactory.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationFactory.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationPackage.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationPackage.java
index 48e7d6bb9..48e7d6bb9 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationPackage.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/JavaapplicationPackage.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/Java2DirectoryImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/Java2DirectoryImpl.java
index 3957df449..3957df449 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/Java2DirectoryImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/Java2DirectoryImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/Java2FileImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/Java2FileImpl.java
index 102e1d8ff..102e1d8ff 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/Java2FileImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/Java2FileImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaApplicationImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaApplicationImpl.java
index 086c8de2b..086c8de2b 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaApplicationImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaApplicationImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaJar2FileImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaJar2FileImpl.java
index 5cabaf921..5cabaf921 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaJar2FileImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaJar2FileImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaNodeSourceRegionImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaNodeSourceRegionImpl.java
index 73ae16d00..73ae16d00 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaNodeSourceRegionImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaNodeSourceRegionImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationFactoryImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationFactoryImpl.java
index 211579448..211579448 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationFactoryImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationFactoryImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationPackageImpl.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationPackageImpl.java
index f549b2a00..f549b2a00 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationPackageImpl.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/impl/JavaapplicationPackageImpl.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationAdapterFactory.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationAdapterFactory.java
index bd63937e4..bd63937e4 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationAdapterFactory.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationAdapterFactory.java
diff --git a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationSwitch.java b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationSwitch.java
index 114eb3d4d..114eb3d4d 100644
--- a/org.eclipse.modisco.java.composition/src/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationSwitch.java
+++ b/org.eclipse.modisco.java.composition/src-gen/org/eclipse/modisco/java/composition/javaapplication/util/JavaapplicationSwitch.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.checkstyle b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.classpath b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.classpath
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/build.properties b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/build.properties
index 02e82c57b..8b0b60f1e 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/build.properties
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/build.properties
@@ -8,7 +8,7 @@
 # Contributors:

 #    Nicolas Bros (Mia-Software) - initial API and implementation

 ###############################################################################

-# Copyright (c) 2009, 2011 Mia-Software.

+# Copyright (c) 2009, 2018 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

@@ -17,6 +17,7 @@
 # Contributors:

 #     Gregoire DUPE (Mia-Software) - initial API and implementation

 #     Gregoire DUPE (Mia-Software) - Bug 341752 - Extract report metamodel from the benchmark plug-in to avoid Acceleo troubles.

+#	  Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # 

 

 bin.includes = .,\

@@ -26,6 +27,6 @@ bin.includes = .,\
                OSGI-INF/,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/model/JavaBenchmark.genmodel b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/model/JavaBenchmark.genmodel
index 3eee2bf5f..0c61ad14d 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/model/JavaBenchmark.genmodel
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/model/JavaBenchmark.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2009, 2011 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;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - Bug 341752 - Extract report metamodel from the benchmark plug-in to avoid Acceleo troubles.&#xD;&#xA;    Nicolas Bros (Mia-Software) - extracted Java benchmark"

-    modelDirectory="/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;    Gregoire DUPE (Mia-Software) - initial API and implementation&#xD;&#xA;    Gregoire DUPE (Mia-Software) - Bug 341752 - Extract report metamodel from the benchmark plug-in to avoid Acceleo troubles.&#xD;&#xA;    Nicolas Bros (Mia-Software) - extracted Java benchmark&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen"

     editDirectory="/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark.edit/src"

     editorDirectory="/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark.editor/src"

     modelPluginID="org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark" modelName="JavaBenchmark"

diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractCDODiscovery.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractCDODiscovery.java
index ca6c1f119..ca6c1f119 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractCDODiscovery.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractCDODiscovery.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractJavaProject.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractJavaProject.java
index 5fb26d732..5fb26d732 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractJavaProject.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/AbstractJavaProject.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDODiscovery.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDODiscovery.java
index 700454c0a..700454c0a 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDODiscovery.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDODiscovery.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDOProjectDiscovery.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDOProjectDiscovery.java
index ba6493d9e..ba6493d9e 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDOProjectDiscovery.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/CDOProjectDiscovery.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkFactory.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkFactory.java
index fd8d8a7c7..fd8d8a7c7 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkFactory.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkFactory.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkPackage.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkPackage.java
index 6481c05e0..6481c05e0 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkPackage.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaBenchmarkPackage.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaDiscoveredProject.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaDiscoveredProject.java
index e46fd02cb..e46fd02cb 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaDiscoveredProject.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaDiscoveredProject.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaProject.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaProject.java
index f9aa8d44a..f9aa8d44a 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaProject.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/JavaProject.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractCDODiscoveryImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractCDODiscoveryImpl.java
index 851bb7b56..851bb7b56 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractCDODiscoveryImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractCDODiscoveryImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractJavaProjectImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractJavaProjectImpl.java
index 2d5893e26..2d5893e26 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractJavaProjectImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/AbstractJavaProjectImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDODiscoveryImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDODiscoveryImpl.java
index 84c83079a..84c83079a 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDODiscoveryImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDODiscoveryImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDOProjectDiscoveryImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDOProjectDiscoveryImpl.java
index 530adae9b..530adae9b 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDOProjectDiscoveryImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/CDOProjectDiscoveryImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkFactoryImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkFactoryImpl.java
index a2ce84ce7..a2ce84ce7 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkFactoryImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkFactoryImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkPackageImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkPackageImpl.java
index edb0da112..edb0da112 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkPackageImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaBenchmarkPackageImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaDiscoveredProjectImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaDiscoveredProjectImpl.java
index 7ca903d0a..7ca903d0a 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaDiscoveredProjectImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaDiscoveredProjectImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaProjectImpl.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaProjectImpl.java
index d55a53118..d55a53118 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaProjectImpl.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/impl/JavaProjectImpl.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkAdapterFactory.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkAdapterFactory.java
index 0e941e08e..0e941e08e 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkAdapterFactory.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkAdapterFactory.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkSwitch.java b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkSwitch.java
index 55629760f..55629760f 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkSwitch.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/src-gen/org/eclipse/modisco/java/discoverer/benchmark/javaBenchmark/util/JavaBenchmarkSwitch.java
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/.checkstyle b/org.eclipse.modisco.java.discoverer.benchmark.tests/.checkstyle
index 112d8623e..8848c1f46 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/Activator.java b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/Activator.java
index 1eb072102..bc43a5a91 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/Activator.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -38,7 +38,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -51,7 +51,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java
index 9060e8fd9..fa4f4b070 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/src/org/eclipse/modisco/java/discoverer/benchmark/tests/JavaScalabilityTest.java
@@ -52,11 +52,11 @@ public class JavaScalabilityTest {
 	@Before

 	public void initResource() throws CoreException, IOException,

 			InterruptedException {

-		

-		if (Boolean.parseBoolean(System.getenv().get("skip.long.junit.tests"))) { 

-		    throw new RuntimeException("skipped"); 

-		} 

-		

+

+		if (Boolean.parseBoolean(System.getenv().get("skip.long.junit.tests"))) {

+		    throw new RuntimeException("skipped");

+		}

+

 		if (this.sourceCodeProject == null) {

 

 			IProject newSourceProject = ResourcesPlugin.getWorkspace()

@@ -84,17 +84,17 @@ public class JavaScalabilityTest {
 

 	/**

 	 * A basic memory usage test, for standard and incremental Java discoverer

-	 * 

+	 *

 	 * @throws CoreException

 	 * @throws IOException

 	 */

 	@Test(timeout=30*60*1000)

 	public void testMemoryUsed() throws CoreException, IOException {

-		

-		if (Boolean.parseBoolean(System.getenv().get("skip.long.junit.tests"))) { 

-		    throw new RuntimeException("skipped"); 

+

+		if (Boolean.parseBoolean(System.getenv().get("skip.long.junit.tests"))) {

+		    throw new RuntimeException("skipped");

 		}

-		

+

 		Assert.assertTrue(JavaScalabilityTest.PROJECT_NAME

 				+ " project has not been initialized for benchmark.", //$NON-NLS-1$

 				this.sourceCodeProject.exists());

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/.checkstyle b/org.eclipse.modisco.java.discoverer.benchmark/.checkstyle
index 2a19e47ca..e4590a2ba 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer.benchmark/.checkstyle
@@ -1,13 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
     <file-match-pattern match-pattern="HtmlReport.*java" include-pattern="false"/>
   </fileset>
-  <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/java/discoverer/benchmark/reportmodel"/>
-  </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java
index fb9ebdde2..5f6a57f01 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/AbstractRunBenchmark.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

@@ -90,11 +90,11 @@ public abstract class AbstractRunBenchmark implements IDiscoverer<IJavaProject>
 	public int getPort() {

 		return this.port;

 	}

-	

+

 	public boolean isApplicableTo(final IJavaProject source) {

 		return source.getProject().isAccessible();

 	}

-	

+

 	public void discoverElement(final IJavaProject source, final IProgressMonitor monitor)

 			throws DiscoveryException {

 		try {

@@ -154,8 +154,8 @@ public abstract class AbstractRunBenchmark implements IDiscoverer<IJavaProject>
 			Activator.getDefault().getLog().log(status);

 		}

 	}

-	

-	

+

+

 

 	protected void initStatProject(final IJavaProject sourceProject) {

 		IWorkspace ws = ResourcesPlugin.getWorkspace();

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Activator.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Activator.java
index 0d971e501..e854f385d 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Activator.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkDiscoverer.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkDiscoverer.java
index d7b9a2eb6..34628b605 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkDiscoverer.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkDiscoverer.java
@@ -71,7 +71,7 @@ public class JavaBenchmarkDiscoverer extends AbstractModelDiscoverer<IFile> {
 	public void setNumberOfIterations(final int iterations) {

 		this.numberOfIterations = iterations;

 	}

-	

+

 	public int getNumberOfIterations() {

 		return this.numberOfIterations;

 	}

@@ -259,7 +259,7 @@ public class JavaBenchmarkDiscoverer extends AbstractModelDiscoverer<IFile> {
 		discovery.setDicoveryDate(new Date());

 		discovery.setDiscovererClassName(DiscoverJavaModelFromJavaProject.class.getName());

 		discovery.setDiscovererId(DiscoverJavaModelFromJavaProject.ID

-				+ " v" + Activator.getDefault().getBundle().getVersion().toString()); //$NON-NLS-1$ 

+				+ " v" + Activator.getDefault().getBundle().getVersion().toString()); //$NON-NLS-1$

 		discovery.setMaxUsedMemoryInBytes(totalMemory);

 		discovery

 				.setTotalExecutionTimeInSeconds((discoveryTime / JavaBenchmarkDiscoverer.MILLISECONDS_PER_SECOND));

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkHtmlReportDiscoverer.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkHtmlReportDiscoverer.java
index a0d81ccac..b0e16b712 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkHtmlReportDiscoverer.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/JavaBenchmarkHtmlReportDiscoverer.java
@@ -54,7 +54,7 @@ public class JavaBenchmarkHtmlReportDiscoverer extends AbstractDiscoverer<IFile>
 		// refresh needed because Acceleo generates without using the

 		// workspace IResource API

 		location.refreshLocal(IResource.DEPTH_INFINITE, monitor);

-		

+

 		return location.getFile(new Path(JavaBenchmarkHtmlReportDiscoverer.TARGET_FILENAME));

 	}

 

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Messages.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Messages.java
index 3ace29f21..1231e0abc 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Messages.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Messages.java
@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 /**

  * @author gdupe

- * 

+ *

  */

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.java.discoverer.benchmark.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Report.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Report.java
index 2167db4b7..161563cba 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Report.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/Report.java
@@ -81,7 +81,7 @@ import org.eclipse.swt.graphics.Point;
 

 /**

  * @author Gregoire DUPE (Mia-Software)

- * 

+ *

  */

 public class Report {

 	private static final int MINUTE_MS_RANGE = 60000;

@@ -354,7 +354,7 @@ public class Report {
 	}

 

 	/**

-	 * 

+	 *

 	 */

 	private void rescaleDebugCode(final long maxMemory) {

 		float coef = new Float(maxMemory) / Report.RESCALE_COEF;

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmark.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmark.java
index 655d7d37d..c8ebe1c4c 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmark.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmark.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java
index 25a86772d..8eaff9087 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/RunBenchmarkIncVsClassical.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java
index ca61fc2c8..bf535ba26 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/actions/GenerateReportAction.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/BenchmarkJavaDiscovererCDO.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/BenchmarkJavaDiscovererCDO.java
index bd466bf37..858728392 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/BenchmarkJavaDiscovererCDO.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/BenchmarkJavaDiscovererCDO.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Fabien Giquel (Mia-Software) - initial API and implementation

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/JavaDiscovererCDOWithoutTrace.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/JavaDiscovererCDOWithoutTrace.java
index 21bb12e63..a7635a0a6 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/JavaDiscovererCDOWithoutTrace.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/JavaDiscovererCDOWithoutTrace.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/nousage/JavaDiscovererCDONoUsages.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/nousage/JavaDiscovererCDONoUsages.java
index 0cfea7712..66f1803fc 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/nousage/JavaDiscovererCDONoUsages.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/client/nousage/JavaDiscovererCDONoUsages.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/DerbyCDOServerNoAudits.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/DerbyCDOServerNoAudits.java
index 8786ba9f3..331c9ed67 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/DerbyCDOServerNoAudits.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/DerbyCDOServerNoAudits.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java
index 90b954bcc..8dc573971 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/cdo/server/H2CDOServer.java
@@ -4,12 +4,12 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

  *     Stephane Rousseau (Mia-Software) - Bug 339695 - H2 support in MoDisco Java discoverer benchmarks

- *     Nicolas Bros (Mia-Software) - Bug 342272 - [Junit] timeout in Java benchmark : CDO server doesn't start 

+ *     Nicolas Bros (Mia-Software) - Bug 342272 - [Junit] timeout in Java benchmark : CDO server doesn't start

  */

 package org.eclipse.modisco.java.discoverer.benchmark.cdo.server;

 

@@ -61,7 +61,7 @@ public class H2CDOServer extends AbstractCDOServer {
 		props.put(IRepository.Props.SUPPORTING_AUDITS, Boolean.TRUE.toString());

 		// props.put(IRepository.Props.VERIFYING_REVISIONS, Boolean.FALSE

 		// .toString());

-		// TODO Bug 329887 

+		// TODO Bug 329887

 		// props.put(IRepository.Props.CURRENT_LRU_CAPACITY, Integer

 		// .toString(CURRENT_LRU_CAPACITY));

 		// props.put(IRepository.Props.REVISED_LRU_CAPACITY, Integer

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererClassicalEMF.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererClassicalEMF.java
index 26812294a..7be426c3f 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererClassicalEMF.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererClassicalEMF.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Romain Dervaux (Mia-Software) - initial API and implementation

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFMinimalEObject.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFMinimalEObject.java
index a8cfc14fa..9f8af5e18 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFMinimalEObject.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFMinimalEObject.java
@@ -4,7 +4,7 @@
  * 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:

  *     Romain Dervaux (Mia-Software) - initial API and implementation

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFNoUsages.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFNoUsages.java
index c0c3834e6..597fcc334 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFNoUsages.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererEMFNoUsages.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalClassicalEMF.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalClassicalEMF.java
index cb5e2fd1f..df7644534 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalClassicalEMF.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalClassicalEMF.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Fabien Giquel (Mia-Software) - initial API and implementation

@@ -20,7 +20,7 @@ import org.eclipse.modisco.java.discoverer.benchmark.emfstat.DiscoverJavaModelFr
 import org.eclipse.modisco.java.discoverer.benchmark.emfstat.JavaReaderEMFStat;

 

 public class JavaDiscovererIncrementalClassicalEMF extends DiscoverJavaModelFromJavaProjectEMFStat {

-	

+

 	@Override

 	protected JavaReaderEMFStat getJavaReader(final java.util.Map<String, Object> elementOptions) {

 		JavaReaderEMFStat javaReader = new JavaReaderEMFStat(getEFactory(), true);

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalEMF.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalEMF.java
index c923c33e3..335a890f5 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalEMF.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/emf/client/JavaDiscovererIncrementalEMF.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Fabien Giquel (Mia-Software) - initial API and implementation

@@ -19,7 +19,7 @@ import org.eclipse.modisco.java.discoverer.benchmark.emfstat.DiscoverJavaModelFr
 import org.eclipse.modisco.java.discoverer.benchmark.emfstat.JavaReaderEMFStat;

 

 public class JavaDiscovererIncrementalEMF extends DiscoverJavaModelFromJavaProjectEMFStat {

-	

+

 	@Override

 	protected JavaReaderEMFStat getJavaReader(final java.util.Map<String, Object> elementOptions) {

 		JavaReaderEMFStat javaReader = new JavaReaderEMFStat(getEFactory(), true);

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/SystemInfo.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/SystemInfo.java
index 309fca33e..e60ea2ae7 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/SystemInfo.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/SystemInfo.java
@@ -94,7 +94,7 @@ public final class SystemInfo {
 		this.nProcessors = bean.getAvailableProcessors();

 

 		this.procName = ""; //$NON-NLS-1$

-		this.procDescription = ""; //$NON-NLS-1$ 

+		this.procDescription = ""; //$NON-NLS-1$

 		this.procCacheSize = ""; //$NON-NLS-1$

 		this.memory = ""; //$NON-NLS-1$

 

@@ -175,7 +175,7 @@ public final class SystemInfo {
 	}

 

 	private static List<String> getInfos(final String name, final String result) {

-		Pattern patternName = Pattern.compile(name + "\\s*:\\s*(.*)"); //$NON-NLS-1$ 

+		Pattern patternName = Pattern.compile(name + "\\s*:\\s*(.*)"); //$NON-NLS-1$

 		Matcher matcher = patternName.matcher(result);

 		List<String> infos = new ArrayList<String>();

 		while (matcher.find()) {

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/handlers/BenchmarkAction.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/handlers/BenchmarkAction.java
index 5eef3d679..52deff713 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/handlers/BenchmarkAction.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/internal/handlers/BenchmarkAction.java
@@ -102,11 +102,11 @@ public class BenchmarkAction extends AbstractHandler {
 				@Override
 				protected IStatus run(final IProgressMonitor monitor) {
 					try {
-						
+
 						IProject project = ResourcesPlugin.getWorkspace().getRoot()
 								.getProject("javaBenchmark_" + System.currentTimeMillis()); //$NON-NLS-1$
 						try {
-							// don't use the Job's monitor because it prevents 
+							// don't use the Job's monitor because it prevents
 							// progress display afterwards
 							project.create(new NullProgressMonitor());
 							project.open(new NullProgressMonitor());
@@ -114,7 +114,7 @@ public class BenchmarkAction extends AbstractHandler {
 							throw new CoreException(new Status(IStatus.ERROR, Activator.PLUGIN_ID,
 									"Couldn't create a project for benchmark results", e)); //$NON-NLS-1$
 						}
-						
+
 						ResourceSet resourceSet = new ResourceSetImpl();
 						Resource resource = resourceSet.createResource(URI
 								.createURI("memory:/javaBenchmark/" //$NON-NLS-1$
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/BirtGraphHelper.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/BirtGraphHelper.java
index e2b770787..5134340db 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/BirtGraphHelper.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/BirtGraphHelper.java
@@ -176,7 +176,7 @@ public final class BirtGraphHelper {
 		PluginSettings ps = PluginSettings.instance();

 		IDeviceRenderer render = ps.getDevice("dv.PNG"); //$NON-NLS-1$

 		render.setProperty(IDeviceRenderer.FILE_IDENTIFIER, new File(targetFolder,

-				"executionTimeByProjectSize.png")); //$NON-NLS-1$ 

+				"executionTimeByProjectSize.png")); //$NON-NLS-1$

 		final int width = 800;

 		final int height = 400;

 		Bounds bounds = BoundsImpl.create(0, 0, width, height);

@@ -189,7 +189,7 @@ public final class BirtGraphHelper {
 	/**

 	 * Computes the linear regression of the given list of points, and returns

 	 * points on the computed line.

-	 * 

+	 *

 	 * @param dataPoints

 	 *            the points to include in the computation

 	 * @return points on the computed approximation line, with the same abscissa

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport.java
index 1593349ef..1f9c45e2f 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire Dupe (Mia-Software) - initial API and implementation

  */

@@ -26,20 +26,20 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 

 /**

  * Entry point of the 'HtmlReport' generation module.

- * 

+ *

  * @generated

  */

 public class HtmlReport extends AbstractAcceleoGenerator {

 	/**

 	 * The name of the module.

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final String MODULE_FILE_NAME = "/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport"; //$NON-NLS-1$

 

 	/**

 	 * The name of the templates that are to be generated.

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final String[] TEMPLATE_NAMES = { "htmlReport" }; //$NON-NLS-1$

@@ -60,7 +60,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	 * retrieval of {@link #getProperties()} and

 	 * {@link #getGenerationListeners()}.

 	 * </p>

-	 * 

+	 *

 	 * @generated

 	 */

 	public HtmlReport() {
@@ -70,7 +70,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	/**

 	 * This allows clients to instantiates a generator with all required

 	 * information.

-	 * 

+	 *

 	 * @param modelURI

 	 *            URI where the model on which this generator will be used is

 	 *            located.

@@ -93,7 +93,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	/**

 	 * This allows clients to instantiates a generator with all required

 	 * information.

-	 * 

+	 *

 	 * @param model

 	 *            We'll iterate over the content of this element to find Objects

 	 *            matching the first parameter of the template we need to call.

@@ -115,7 +115,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 

 	/**

 	 * This can be used to launch the generation from a standalone application.

-	 * 

+	 *

 	 * @param args

 	 *            Arguments of the generation.

 	 * @generated

@@ -127,36 +127,36 @@ public class HtmlReport extends AbstractAcceleoGenerator {
             } else {
                 URI modelURI = URI.createFileURI(args[0]);
                 File folder = new File(args[1]);
-                
+
                 List<String> arguments = new ArrayList<String>();
-                
+
                 /*
                  * Add in this list all the arguments used by the starting point of the generation
                  * If your main template is called on an element of your model and a String, you can
                  * add in "arguments" this "String" attribute.
                  */
-                
+
                 HtmlReport generator = new HtmlReport(modelURI, folder, arguments);
-                
+
                 /*
                  * Add the properties from the launch arguments.
                  * If you want to programmatically add new properties, add them in "propertiesFiles"
                  * You can add the absolute path of a properties files, or even a project relative path.
-                 * If you want to add another "protocol" for your properties files, please override 
+                 * If you want to add another "protocol" for your properties files, please override
                  * "getPropertiesLoaderService(AcceleoService)" in order to return a new property loader.
                  * The behavior of the properties loader service is explained in the Acceleo documentation
                  * (Help -> Help Contents).
                  */
-                 

+

             	//Bug 382359 - Compatibility with Helios

-            	//gdupe> The properties are not used in the generation removing 

+            	//gdupe> The properties are not used in the generation removing

                 // the following lines allow to build against Helios.

                 /*
                 for (int i = 2; i < args.length; i++) {
                     generator.addPropertiesFile(args[i]);
                 }

                 */
-                
+
                 generator.doGenerate(new BasicMonitor());
             }
         } catch (IOException e) {
@@ -166,7 +166,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 

 	/**

 	 * Launches the generation described by this instance.

-	 * 

+	 *

 	 * @param monitor

 	 *            This will be used to display progress information to the user.

 	 * @throws IOException

@@ -201,7 +201,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	/**

 	 * If this generator needs to listen to text generation events, listeners

 	 * can be returned from here.

-	 * 

+	 *

 	 * @return List of listeners that are to be notified when text is generated

 	 *         through this launch.

 	 * @generated

@@ -240,7 +240,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	 * <p>

 	 * All three of these default strategies support merging through JMerge.

 	 * </p>

-	 * 

+	 *

 	 * @return The generation strategy that is to be used for generations

 	 *         launched through this launcher.

 	 * @generated

@@ -254,7 +254,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	 * This will be called in order to find and load the module that will be

 	 * launched through this launcher. We expect this name not to contain file

 	 * extension, and the module to be located beside the launcher.

-	 * 

+	 *

 	 * @return The name of the module that is to be launched.

 	 * @generated

 	 */

@@ -276,7 +276,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	 * that needs be returned by a call to {@link #getProperties()} is

 	 * "org.eclipse.acceleo.sample.messages".

 	 * </p>

-	 * 

+	 *

 	 * @return The list of properties file we need to add to the generation

 	 *         context.

 	 * @see java.util.ResourceBundle#getBundle(String)

@@ -290,9 +290,9 @@ public class HtmlReport extends AbstractAcceleoGenerator {
          * to a Java class. For example, if you have a file named "messages.properties" in package "org.eclipse.acceleo.sample",
          * the path that needs be added to this list is "/org/eclipse/acceleo/sample/messages.properties". If you want to change the
          * contentof this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
-         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation of 
+         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation of
          * this class will revert your modifications.
-         * 
+         *
          * To learn more about Properties Files, have a look at the Acceleo Launcher documentation (Help -> Help Contents).
          */
         return propertiesFiles;
@@ -300,7 +300,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 

 	/**
      * Adds a properties file in the list of properties files.
-     * 
+     *
      * @param propertiesFile
      *            The properties file to add.
      * @since 3.1
@@ -318,7 +318,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
   /**

 	 * This will be used to get the list of templates that are to be launched by

 	 * this launcher.

-	 * 

+	 *

 	 * @return The list of templates to call on the module

 	 *         {@link #getModuleName()}.

 	 * @generated

@@ -331,7 +331,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	/**

 	 * This can be used to update the resource set's package registry with all

 	 * needed EPackages.

-	 * 

+	 *

 	 * @param resourceSet

 	 *            The resource set which registry has to be updated.

 	 * @generated NOT

@@ -352,7 +352,7 @@ public class HtmlReport extends AbstractAcceleoGenerator {
 	/**

 	 * This can be used to update the resource set's resource factory registry

 	 * with all needed factories.

-	 * 

+	 *

 	 * @param resourceSet

 	 *            The resource set which registry has to be updated.

 	 * @generated

@@ -366,10 +366,10 @@ public class HtmlReport extends AbstractAcceleoGenerator {
          * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
          * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation
          * of this class will revert your modifications.
-         * 
-         * To learn more about the registration of Resource Factories, have a look at the Acceleo Launcher documentation (Help -> Help Contents). 
-         */ 
-        
+         *
+         * To learn more about the registration of Resource Factories, have a look at the Acceleo Launcher documentation (Help -> Help Contents).
+         */
+
         // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
     }

 

diff --git a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport2.java b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport2.java
index f4185db3a..0b8c0e7a0 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport2.java
+++ b/org.eclipse.modisco.java.discoverer.benchmark/src/org/eclipse/modisco/java/discoverer/benchmark/template/html/HtmlReport2.java
@@ -32,20 +32,20 @@ import org.eclipse.modisco.java.discoverer.benchmark.Activator;
 
 /**
  * Entry point of the 'HtmlReport2' generation module.
- * 
+ *
  * @generated
  */
 public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * The name of the module.
-	 * 
+	 *
 	 * @generated
 	 */
 	public static final String MODULE_FILE_NAME = "/org/eclipse/modisco/java/discoverer/benchmark/template/html/htmlReport2"; //$NON-NLS-1$
 
 	/**
 	 * The name of the templates that are to be generated.
-	 * 
+	 *
 	 * @generated
 	 */
 	public static final String[] TEMPLATE_NAMES = { "htmlReport" }; //$NON-NLS-1$
@@ -53,7 +53,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * The list of properties files from the launch parameters (Launch
 	 * configuration).
-	 * 
+	 *
 	 * @generated
 	 */
 	private List<String> propertiesFiles = new ArrayList<String>();
@@ -69,7 +69,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	 * retrieval of {@link #getProperties()} and
 	 * {@link #getGenerationListeners()}.
 	 * </p>
-	 * 
+	 *
 	 * @generated
 	 */
 	public HtmlReport2() {
@@ -79,7 +79,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * This allows clients to instantiates a generator with all required
 	 * information.
-	 * 
+	 *
 	 * @param modelURI
 	 *            URI where the model on which this generator will be used is
 	 *            located.
@@ -103,7 +103,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * This allows clients to instantiates a generator with all required
 	 * information.
-	 * 
+	 *
 	 * @param model
 	 *            We'll iterate over the content of this element to find Objects
 	 *            matching the first parameter of the template we need to call.
@@ -126,7 +126,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 
 	/**
 	 * This can be used to launch the generation from a standalone application.
-	 * 
+	 *
 	 * @param args
 	 *            Arguments of the generation.
 	 * @generated NOT
@@ -168,7 +168,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 				 * properties files in a bundle.
 				 */
             	//Bug 382359 - Compatibility with Helios
-            	//gdupe> The properties are not used in the generation removing 
+            	//gdupe> The properties are not used in the generation removing
                 // the following lines allow to build against Helios.
                 /*
 				for (int i = 2; i < args.length; i++) {
@@ -184,7 +184,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 
 	/**
 	 * Launches the generation described by this instance.
-	 * 
+	 *
 	 * @param monitor
 	 *            This will be used to display progress information to the user.
 	 * @throws IOException
@@ -229,7 +229,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * If this generator needs to listen to text generation events, listeners
 	 * can be returned from here.
-	 * 
+	 *
 	 * @return List of listeners that are to be notified when text is generated
 	 *         through this launch.
 	 * @generated
@@ -268,7 +268,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	 * <p>
 	 * All three of these default strategies support merging through JMerge.
 	 * </p>
-	 * 
+	 *
 	 * @return The generation strategy that is to be used for generations
 	 *         launched through this launcher.
 	 * @generated
@@ -282,7 +282,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	 * This will be called in order to find and load the module that will be
 	 * launched through this launcher. We expect this name not to contain file
 	 * extension, and the module to be located beside the launcher.
-	 * 
+	 *
 	 * @return The name of the module that is to be launched.
 	 * @generated
 	 */
@@ -304,7 +304,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	 * that needs be returned by a call to {@link #getProperties()} is
 	 * "org.eclipse.acceleo.sample.messages".
 	 * </p>
-	 * 
+	 *
 	 * @return The list of properties file we need to add to the generation
 	 *         context.
 	 * @see java.util.ResourceBundle#getBundle(String)
@@ -318,9 +318,9 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
          * to a Java class. For example, if you have a file named "messages.properties" in package "org.eclipse.acceleo.sample",
          * the path that needs be added to this list is "/org/eclipse/acceleo/sample/messages.properties". If you want to change the
          * contentof this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
-         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation of 
+         * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation of
          * this class will revert your modifications.
-         * 
+         *
          * To learn more about Properties Files, have a look at the Acceleo Launcher documentation (Help -> Help Contents).
          */
         return propertiesFiles;
@@ -328,7 +328,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 
 	/**
 	 * Adds a properties file in the list of properties files.
-	 * 
+	 *
 	 * @param propertiesFile
 	 *            The properties file to add.
 	 * @generated
@@ -347,7 +347,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * This will be used to get the list of templates that are to be launched by
 	 * this launcher.
-	 * 
+	 *
 	 * @return The list of templates to call on the module
 	 *         {@link #getModuleName()}.
 	 * @generated
@@ -360,7 +360,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * This can be used to update the resource set's package registry with all
 	 * needed EPackages.
-	 * 
+	 *
 	 * @param resourceSet
 	 *            The resource set which registry has to be updated.
 	 * @generated
@@ -368,7 +368,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	@Override
 	public void registerPackages(ResourceSet resourceSet) {
         super.registerPackages(resourceSet);
-        
+
         /*
          * TODO If you need additional package registrations, you can register them here. The following line
          * (in comment) is an example of the package registration for UML. If you want to change the content
@@ -377,7 +377,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
          * that has caused the creation of this class will revert your modifications. You can use the method
          * "isInWorkspace(Class c)" to check if the package that you are about to register is in the workspace.
          * To register a package properly, please follow the following conventions:
-         * 
+         *
          * if (!isInWorkspace(UMLPackage.class)) {
          *     // The normal package registration if your metamodel is in a plugin.
          *     resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE);
@@ -386,7 +386,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
          *     // This should be used if your metamodel is in your workspace and if you are using binary resource serialization.
          *     resourceSet.getPackageRegistry().put("/myproject/myfolder/mysubfolder/MyUMLMetamodel.ecore", UMLPackage.eINSTANCE);
          * }
-         * 
+         *
          * To learn more about Package Registration, have a look at the Acceleo Launcher documentation (Help -> Help Contents).
          */
     }
@@ -394,7 +394,7 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
 	/**
 	 * This can be used to update the resource set's resource factory registry
 	 * with all needed factories.
-	 * 
+	 *
 	 * @param resourceSet
 	 *            The resource set which registry has to be updated.
 	 * @generated
@@ -408,10 +408,10 @@ public class HtmlReport2 extends AbstractAcceleoGenerator {
          * of this method, do NOT forget to change the "@generated" tag in the Javadoc of this method to "@generated NOT".
          * Without this new tag, any compilation of the Acceleo module with the main template that has caused the creation
          * of this class will revert your modifications.
-         * 
-         * To learn more about the registration of Resource Factories, have a look at the Acceleo Launcher documentation (Help -> Help Contents). 
-         */ 
-        
+         *
+         * To learn more about the registration of Resource Factories, have a look at the Acceleo Launcher documentation (Help -> Help Contents).
+         */
+
         // resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE);
     }
 
diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/.checkstyle b/org.eclipse.modisco.java.discoverer.cdo.tests/.checkstyle
index 1d9ce8d76..334787e7d 100644
--- a/org.eclipse.modisco.java.discoverer.cdo.tests/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer.cdo.tests/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
    </fileset>
diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java b/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java
index bf2b475fa..5430df274 100644
--- a/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.java.discoverer.cdo.tests/src/org/eclipse/modisco/java/discoverer/cdo/tests/AllTestsInUIThread.java
@@ -16,8 +16,8 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;

 

 @RunWith(Suite.class)

-@SuiteClasses({ 

-	JavaJunitCDO.class 

+@SuiteClasses({

+	JavaJunitCDO.class

 	})

 public class AllTestsInUIThread {

 	// JUnit 4 test suite

diff --git a/org.eclipse.modisco.java.discoverer.cdo/.checkstyle b/org.eclipse.modisco.java.discoverer.cdo/.checkstyle
index 1d9ce8d76..334787e7d 100644
--- a/org.eclipse.modisco.java.discoverer.cdo/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer.cdo/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
    </fileset>
diff --git a/org.eclipse.modisco.java.discoverer.cdo/src/org/eclipse/modisco/java/discoverer/cdo/Activator.java b/org.eclipse.modisco.java.discoverer.cdo/src/org/eclipse/modisco/java/discoverer/cdo/Activator.java
index 39650c711..53f2a992d 100644
--- a/org.eclipse.modisco.java.discoverer.cdo/src/org/eclipse/modisco/java/discoverer/cdo/Activator.java
+++ b/org.eclipse.modisco.java.discoverer.cdo/src/org/eclipse/modisco/java/discoverer/cdo/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Gregoire DUPE (Mia-Software) - initial API and implementation

  *     Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

@@ -27,7 +27,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -40,7 +40,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -53,7 +53,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.discoverer.tests/.checkstyle b/org.eclipse.modisco.java.discoverer.tests/.checkstyle
index daa212328..b4a38b0c1 100644
--- a/org.eclipse.modisco.java.discoverer.tests/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Activator.java b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Activator.java
index ecfe3362c..ddc660612 100644
--- a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Activator.java
+++ b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Activator.java
@@ -36,7 +36,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -49,7 +49,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -62,7 +62,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java
index 7f599d1d3..6fbaf07de 100644
--- a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java
+++ b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/Bug351590ClassCastWithAnnotationMemberTest.java
@@ -47,11 +47,11 @@ public class Bug351590ClassCastWithAnnotationMemberTest extends AbstractDiscover
 		Statement statement = aMethod.getBody().getStatements().get(1);

 		Assert.assertNotNull(statement);

 		Assert.assertTrue(statement instanceof VariableDeclarationStatement);

-		

+

 		Expression initializer = ((VariableDeclarationStatement) statement).getFragments().get(0).getInitializer();

 		Assert.assertNotNull(initializer);

 		Assert.assertTrue(initializer instanceof MethodInvocation);

-		

+

 		// Here, the fix has create some unresolvedMethod with a name indicating the true AnnotationTypeMemberDeclaration

 		AbstractMethodDeclaration method = ((MethodInvocation) initializer).getMethod();

 		Assert.assertNotNull(method);

diff --git a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/utils/JavaProjectFactory.java b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/utils/JavaProjectFactory.java
index bd1ded9b0..ecc7c0d6f 100644
--- a/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/utils/JavaProjectFactory.java
+++ b/org.eclipse.modisco.java.discoverer.tests/src/org/eclipse/modisco/java/discoverer/tests/utils/JavaProjectFactory.java
@@ -37,7 +37,7 @@ import org.eclipse.jdt.launching.JavaRuntime;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class JavaProjectFactory {

 

@@ -158,15 +158,15 @@ public class JavaProjectFactory {
 

 	/**

 	 * when a java project try to set an unbound vm

-	 * for its execution environment. 

+	 * for its execution environment.

 	 * For instance, if it try to use a jvm 1.6 and there is only an install of jvm 1.5

-	 * @throws CoreException 

+	 * @throws CoreException

 	 */

 	public void setExecutionEnvironmentWithUnboundVm() throws CoreException {

 		IPath oldOutput = this.javaProject.getOutputLocation();

 		this.javaProject.setRawClasspath(new IClasspathEntry[0], null);

 		this.createSourceFolder();

-		this.javaProject.setOutputLocation(oldOutput, null);		

+		this.javaProject.setOutputLocation(oldOutput, null);

 		this.addSystemLibraries("bug328143");	 //$NON-NLS-1$

 		this.project.refreshLocal(IResource.DEPTH_INFINITE, null);

 	}

diff --git a/org.eclipse.modisco.java.discoverer.ui/.checkstyle b/org.eclipse.modisco.java.discoverer.ui/.checkstyle
index 738176cce..70dce5ab8 100644
--- a/org.eclipse.modisco.java.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer.ui/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/Activator.java b/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/Activator.java
index 925157c88..5f47849f1 100644
--- a/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/Activator.java
+++ b/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/JavaElementsToAnalyzeComposite.java b/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/JavaElementsToAnalyzeComposite.java
index 51220d052..404143eff 100644
--- a/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/JavaElementsToAnalyzeComposite.java
+++ b/org.eclipse.modisco.java.discoverer.ui/src/org/eclipse/modisco/java/discoverer/ui/internal/JavaElementsToAnalyzeComposite.java
@@ -83,12 +83,12 @@ public class JavaElementsToAnalyzeComposite extends
 

 		this.button.forceFocus();

 	}

-	

+

 	// to avoid the "synthetic access" warning

 	protected void fireChangedLocal() {

 		super.fireChanged();

 	}

-	

+

 	protected void commit() {

 		fireCommit();

 	}

diff --git a/org.eclipse.modisco.java.discoverer/.checkstyle b/org.eclipse.modisco.java.discoverer/.checkstyle
index d18c65877..6bd51546b 100644
--- a/org.eclipse.modisco.java.discoverer/.checkstyle
+++ b/org.eclipse.modisco.java.discoverer/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/ElementsToAnalyze.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/ElementsToAnalyze.java
index 948f02682..d9dc460cf 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/ElementsToAnalyze.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/ElementsToAnalyze.java
@@ -68,7 +68,7 @@ public class ElementsToAnalyze {
 

 	/**

 	 * Adds an artifact to analyze.

-	 * 

+	 *

 	 * @param element

 	 *            a {@link IJavaProject} or a {@link IPackageFragment}

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/DiscoverKDMModelFromEMFResources.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/DiscoverKDMModelFromEMFResources.java
index c53a8c7b2..f0d281f25 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/DiscoverKDMModelFromEMFResources.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/DiscoverKDMModelFromEMFResources.java
@@ -33,7 +33,7 @@ import org.eclipse.modisco.kdm.source.discoverer.IKDMDiscoveryConstants;
 

 /**

  * Discover a KDM model from a project with the java nature.

- * 

+ *

  * @since 0.12

  */

 public class DiscoverKDMModelFromEMFResources extends

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/IModelReader.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/IModelReader.java
index 34e8f8c81..701bae497 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/IModelReader.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/IModelReader.java
@@ -42,7 +42,7 @@ public interface IModelReader {
 	 * This is a convenience method for

 	 * {@link #readModel(Object, Model, BindingManager, IProgressMonitor)} with

 	 * a private blank {@code BindingManager}.

-	 * 

+	 *

 	 * @see #readModel(Object, Model, BindingManager, IProgressMonitor)

 	 * @param source

 	 *            the source element to analyse

@@ -60,7 +60,7 @@ public interface IModelReader {
 	 * Readers implementing this method should throw an

 	 * {@link IllegalArgumentException} if source is not analysable.

 	 * </p>

-	 * 

+	 *

 	 * @param source

 	 *            the source to analyse

 	 * @param model

@@ -86,7 +86,7 @@ public interface IModelReader {
 	 * <p>

 	 * Clients shouldn't make modifications on the resulting {@code Model}.

 	 * </p>

-	 * 

+	 *

 	 * @param monitor

 	 *            a monitor to report progress

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/JavaActivator.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/JavaActivator.java
index 2a012e6b8..fe4ed237f 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/JavaActivator.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/JavaActivator.java
@@ -40,7 +40,7 @@ public class JavaActivator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

 	 */

@@ -52,7 +52,7 @@ public class JavaActivator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

@@ -64,7 +64,7 @@ public class JavaActivator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JavaActivator getDefault() {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/core/JavaJdtBridge.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/core/JavaJdtBridge.java
index 89089523b..b06f98963 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/core/JavaJdtBridge.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/core/JavaJdtBridge.java
@@ -52,7 +52,7 @@ public class JavaJdtBridge {
 	 * is to match compilation unit which contains the IType with instance of

 	 * CompilationUnit in JavaModel. Then, we will have to find corresponding

 	 * type.

-	 * 

+	 *

 	 * @param resource

 	 *            the JavaModel reflecting the java project

 	 * @param jdtType

@@ -95,7 +95,7 @@ public class JavaJdtBridge {
 	 * constructor or an operation. The strategy is to match compilation unit

 	 * which contains the IMethod with instance of CompilationUnit in JavaModel.

 	 * Then, we will have to find corresponding type and method.

-	 * 

+	 *

 	 * @param resource

 	 *            the JavaModel reflecting the java project

 	 * @param javaMethod

@@ -231,8 +231,8 @@ public class JavaJdtBridge {
 		 * declaration expression (in a loop) 3. container is a variable

 		 * declaration statement (local variable) 4. container is a method

 		 * declaration (parameter) 5. container is an enumeration declaration

-		 * 

-		 * 

+		 *

+		 *

 		 * For cases 1 and 5, we are able to retrieve a jdt element, for other

 		 * cases, there is no trivial way to retrieve corresponding jdt element.

 		 */

@@ -306,7 +306,7 @@ public class JavaJdtBridge {
 	 * From an IPackageFragment (instance from JDT abstract syntax tree) we

 	 * would like to retrieve corresponding element in JavaModel of the project.

 	 * The strategy is to match the package declaration using qualified name.

-	 * 

+	 *

 	 * @param resource

 	 *            the JavaModel reflecting the java project

 	 * @param jdtFragment

@@ -351,7 +351,7 @@ public class JavaJdtBridge {
 	 * we are not able to select local variables and method parameters, so we

 	 * only have to manage cases of class variables (static) and instance

 	 * variables.

-	 * 

+	 *

 	 * @param resource

 	 *            the JavaModel reflecting the java project

 	 * @param jdtField

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/CommentsManager.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/CommentsManager.java
index 5516e8af6..eafec9fdb 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/CommentsManager.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/CommentsManager.java
@@ -71,7 +71,7 @@ public final class CommentsManager {
 		unLocatedComments.addAll(moDiscoCuNode.getComments());

 		/*

 		 * To manage the comments inside a class declaration:

-		 * 

+		 *

 		 * As all comments inside are generated at the end of the class

 		 * declaration, because we don't store where it comes from (line

 		 * position). So we should try to attach these comments to a better

@@ -114,7 +114,7 @@ public final class CommentsManager {
 

 	/**

 	 * Linking comments to Nodes using jdt location informations

-	 * 

+	 *

 	 * @param visitor

 	 * @param cuJdtNode

 	 * @param moDiscoCuNode

@@ -135,10 +135,10 @@ public final class CommentsManager {
 					 * 11, for a method definition, start index will be 4 and

 					 * end will be 6. Ordering will consider first the node

 					 * whose starting index is the highest.

-					 * 

+					 *

 					 * But what if a node has only a trailing comment ? first

 					 * leading comment index = -1 !

-					 * 

+					 *

 					 * Here is a summary of all cases available:

 					 * <table border="1">

 					 * <tr>

@@ -164,21 +164,21 @@ public final class CommentsManager {
 					 * </tr>

 					 * </tr>

 					 * </table>

-					 * 

+					 *

 					 * Note: for each case, we cannot gather the information of

 					 * having, or not, comments inside the element (specific to

 					 * elements which have a block ?)

 					 * <ul>

 					 * <li>case A: We have no comments before and after the

 					 * element

-					 * 

+					 *

 					 * <li>case B: We have comments before the element

-					 * 

+					 *

 					 * <li>case C: We have comments before and after the element

-					 * 

+					 *

 					 * <li>case D: We have comments after the element

 					 * </ul>

-					 * 

+					 *

 					 * Warning: a bug has been potentially found ! The start

 					 * position of a node corresponds to the extended start

 					 * position (including comments and whitespace)) but only

@@ -200,7 +200,7 @@ public final class CommentsManager {
 					 * <li>Comments inside are comments in the node that are not

 					 * before or after.

 					 * </ul>

-					 * 

+					 *

 					 */

 					public int compare(final Integer o1, final Integer o2) {

 						return -o1.compareTo(o2);

@@ -209,11 +209,11 @@ public final class CommentsManager {
 		for (org.eclipse.jdt.core.dom.ASTNode node : visitor.getBijectiveMap().getKeys()) {

 			/*

 			 * we have to decide if the element has comment

-			 * 

+			 *

 			 * 1. firstLeadingCommentIndex != -1

-			 * 

+			 *

 			 * 2. lastTrailingCommentIndex != -1

-			 * 

+			 *

 			 * 3. start position of a comment in the list is included in the

 			 * range of start position and end position of the element. This

 			 * algorithm may lead to add some elements that have no comments ...

@@ -418,7 +418,7 @@ public final class CommentsManager {
 	 * a block, with at least one blank line before next node and one blank line

 	 * after last node - comments in a block, at the end and with at least one

 	 * blank line after last node. Use another algorithm to link them.

-	 * 

+	 *

 	 * @param comment

 	 * @param visitor

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java
index f3649ac22..87ae24af8 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitor.java
@@ -56,7 +56,7 @@ import org.eclipse.modisco.java.discoverer.internal.io.library.LibraryReader;
 

 /**

  * The main class for populating the Java model from the JDT model.

- * 

+ *

  * @see Model

  * @see ASTVisitor

  */

@@ -77,7 +77,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * The resulting model.

-	 * 

+	 *

 	 * @see Model

 	 */

 	private final Model jdtModel;

@@ -105,7 +105,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * {@link BijectiveMap} used to retrieve Java comments.

-	 * 

+	 *

 	 * @see CommentsManager

 	 */

 	private final BijectiveMap<org.eclipse.jdt.core.dom.ASTNode, Comment> commentsBinding = new BijectiveMap<org.eclipse.jdt.core.dom.ASTNode, Comment>();

@@ -122,7 +122,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Current RootType.

-	 * 

+	 *

 	 * @see org.eclipse.jdt.core.dom.CompilationUnit#getTypeRoot()

 	 */

 	private AbstractTypeDeclaration rootTypeOrEnum = null;

@@ -143,7 +143,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * affect generic informations to {@code element}.

-	 * 

+	 *

 	 * @param element

 	 *            the ASTNode to initialize

 	 * @param node

@@ -206,7 +206,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the EMF factory.

-	 * 

+	 *

 	 * @return the EMF factory

 	 */

 	JavaFactory getFactory() {

@@ -215,7 +215,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the {@code Model}.

-	 * 

+	 *

 	 * @return the {@code Model}

 	 */

 	Model getJdtModel() {

@@ -224,7 +224,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the {@code BijectiveMap} dedicated to comments.

-	 * 

+	 *

 	 * @return the {@code BijectiveMap} dedicated to comments

 	 */

 	BijectiveMap<org.eclipse.jdt.core.dom.ASTNode, Comment> getCommentsBinding() {

@@ -233,7 +233,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the {@code BijectiveMap} dedicated to {@code ASTNode}s.

-	 * 

+	 *

 	 * @return the {@code BijectiveMap} dedicated to {@code ASTNode}s

 	 */

 	BijectiveMap<org.eclipse.jdt.core.dom.ASTNode, ASTNode> getBijectiveMap() {

@@ -242,7 +242,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the root type of this compilation unit.

-	 * 

+	 *

 	 * @return the root type, or {@code null} if none

 	 * @see org.eclipse.jdt.core.dom.CompilationUnit#getTypeRoot()

 	 */

@@ -252,7 +252,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the JDT {@code CompilationUnit} object currently visited.

-	 * 

+	 *

 	 * @return the JDT {@code CompilationUnit} object currently visited

 	 */

 	org.eclipse.jdt.core.dom.CompilationUnit getCuNode() {

@@ -261,7 +261,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Returns the content (text) of this compilation unit.

-	 * 

+	 *

 	 * @return the content (text) of this compilation unit.

 	 */

 	String getJavaContent() {

@@ -2014,7 +2014,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Indicate if a {@code SimpleName} is an array length access.

-	 * 

+	 *

 	 * @param node

 	 *            the {@code SimpleName}

 	 * @return {@code true} if {@code node} is a length array access,

@@ -2054,7 +2054,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * indicate if {@code node} is of type array.

-	 * 

+	 *

 	 * @param node

 	 *            the expression

 	 * @return {@code true} if it is of type array, {@code false} otherwise

@@ -2070,7 +2070,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Indicate if {@code node} is the name of a constructor declaration.

-	 * 

+	 *

 	 * @param node

 	 *            the {@code SimpleName}

 	 * @return {@code true} if this {@code SimpleName} is a name of a

@@ -2098,7 +2098,7 @@ public class JDTVisitor extends ASTVisitor {
 	 * {@link org.eclipse.jdt.core.dom.MemberRef MemberRef}. Used because a

 	 * MemberRef directly references a NamedElement, so we don't want

 	 * SingleVariableAccess, etc.

-	 * 

+	 *

 	 * @param node

 	 *            the {@code SimpleName}

 	 * @return {@code true} if {@code node} is the name of a MemberRef,

@@ -2918,7 +2918,7 @@ public class JDTVisitor extends ASTVisitor {
 	/**

 	 * Fill informations in the MoDisco {@code AbstractTypeDeclaration} node

 	 * from the JDT {@code AbstractTypeDeclaration} node.

-	 * 

+	 *

 	 * @param node

 	 *            the JDT {@code AbstractTypeDeclaration} node

 	 * @param element

@@ -3026,7 +3026,7 @@ public class JDTVisitor extends ASTVisitor {
 	/**

 	 * Fill informations in the MoDisco {@code BodyDeclaration} node from the

 	 * JDT {@code BodyDeclaration} node.

-	 * 

+	 *

 	 * @param node

 	 *            the JDT {@code BodyDeclaration} node

 	 * @param element

@@ -3067,7 +3067,7 @@ public class JDTVisitor extends ASTVisitor {
 

 	/**

 	 * Complete the MoDisco modifier with the informations of the JDT Modifier.

-	 * 

+	 *

 	 * @param jdtModifier

 	 *            the JDT Modifier

 	 * @param modiscoModifier

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitorUtils.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitorUtils.java
index 908d380ef..5e7762330 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitorUtils.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JDTVisitorUtils.java
@@ -71,7 +71,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * Resolves the JDT <code>name</code> and sorts the targeted

 	 * <code>element</code> in the local or global <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param element

 	 *            the declared Java entity.

 	 * @param name

@@ -97,7 +97,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * Resolves and sorts the pending reference in the local or the global

 	 * <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param element

 	 *            the <code>PendingElement</code> associated with this reference

 	 * @param name

@@ -124,7 +124,7 @@ public final class JDTVisitorUtils {
 	 * Resolves this JDT PrimitiveType <code>type</code> and creates the

 	 * corresponding MoDisco {@link PrimitiveType} object (or returns a similar

 	 * PrimitiveType if any).

-	 * 

+	 *

 	 * @param type

 	 *            the JDT PrimitiveType node.

 	 * @param visitor

@@ -145,7 +145,7 @@ public final class JDTVisitorUtils {
 			primitiveType.setName(id.toString());

 			visitor.getJdtModel().getOrphanTypes().add(primitiveType);

 			visitor.getGlobalBindings().addTarget(id, primitiveType);

-			MoDiscoLogger.logError("primitiveType == null", JavaActivator.getDefault()); //$NON-NLS-1$ 

+			MoDiscoLogger.logError("primitiveType == null", JavaActivator.getDefault()); //$NON-NLS-1$

 

 		}

 		return primitiveType;

@@ -155,7 +155,7 @@ public final class JDTVisitorUtils {
 	 * Resolves this JDT ParameterizedType <code>type</code> and creates the

 	 * corresponding MoDisco {@link ParameterizedType} object (or returns a

 	 * similar ParameterizedType if any).

-	 * 

+	 *

 	 * @param type

 	 *            the JDT ParameterizedType node.

 	 * @param visitor

@@ -197,7 +197,7 @@ public final class JDTVisitorUtils {
 	 * Resolves this JDT WildCardType <code>type</code> and creates the

 	 * corresponding MoDisco {@link WildCardType} object (or returns a similar

 	 * WildCardType if any).

-	 * 

+	 *

 	 * @param type

 	 *            the JDT WildCardType node.

 	 * @param visitor

@@ -227,7 +227,7 @@ public final class JDTVisitorUtils {
 	 * Resolves this JDT ArrayType <code>type</code> and creates the

 	 * corresponding MoDisco {@link ArrayType} object (or returns a similar

 	 * ArrayType if any).

-	 * 

+	 *

 	 * @param type

 	 *            the JDT ArrayType node.

 	 * @param visitor

@@ -257,7 +257,7 @@ public final class JDTVisitorUtils {
 	 * Manages the reference to a constructor. If the targeted constructor has

 	 * already been visited, the reference is resolved. Otherwise, the pending

 	 * reference is added to the global <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param element

 	 *            the <code>PendingElement</code> associated with this reference

 	 * @param constructorCall

@@ -283,7 +283,7 @@ public final class JDTVisitorUtils {
 	 * Manages the reference to a constructor. If the targeted constructor has

 	 * already been visited, the reference is resolved. Otherwise, the pending

 	 * reference is added to the global <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param element

 	 *            the <code>PendingElement</code> associated with this reference

 	 * @param constructorCall

@@ -310,7 +310,7 @@ public final class JDTVisitorUtils {
 	 * constructor has already been visited, the reference is resolved.

 	 * Otherwise, the pending reference is added to the global

 	 * <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param element

 	 *            the <code>PendingElement</code> associated with this reference

 	 * @param constructorCall

@@ -335,7 +335,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * First creation of the Java primitives types which are placed as targets

 	 * in the global <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF <code>factory</code>

 	 * @param model

@@ -420,7 +420,7 @@ public final class JDTVisitorUtils {
 	}

 

 	/**

-	 * 

+	 *

 	 * @param oldClientNode

 	 * @param newClientNode

 	 * @param oldClientLinkName

@@ -444,7 +444,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * Complete <code>PendingElement</code> instances with client node and

 	 * client link name.

-	 * 

+	 *

 	 * @param clientNode

 	 * @param modiscoNode

 	 * @param clientLinkName

@@ -466,7 +466,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * For unresolved items, <code>TypeAccess</code> may not have been yet

 	 * created (no kind of binding)

-	 * 

+	 *

 	 * @param node

 	 *            a type access (<code>PendingElement</code> or resolved

 	 *            <code>TypeAccess</code>)

@@ -502,7 +502,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * For unresolved items, <code>SingleVariableAccess</code> may not have been

 	 * yet created (no kind of binding)

-	 * 

+	 *

 	 * @param node

 	 *            a variable access (<code>PendingElement</code> or resolved

 	 *            <code>SingleVariableAccess</code>)

@@ -535,7 +535,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * For unresolved items as qualifiers, <code>UnresolvedItemAccess</code> may

 	 * not have been yet created

-	 * 

+	 *

 	 * @param node

 	 *            an expression (<code>PendingElement</code> or resolved

 	 *            <code>Expression</code>)

@@ -555,7 +555,7 @@ public final class JDTVisitorUtils {
 	/**

 	 * For unresolved items as qualifiers, <code>UnresolvedItemAccess</code> may

 	 * not have been yet created

-	 * 

+	 *

 	 * @param node

 	 *            an expression or PackageAccess (<code>PendingElement</code> or

 	 *            resolved <code>Expression</code> or resolved

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JavaReader.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JavaReader.java
index c1b4669a3..0734c920e 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JavaReader.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/JavaReader.java
@@ -69,7 +69,7 @@ import org.eclipse.modisco.kdm.source.extension.discovery.ISourceRegionNotifier;
  * javaProject should reference a java project of an alive Eclipse Workspace!

  * (cf https://bugs.eclipse.org/bugs/show_bug.cgi?id=87852)

  * </p>

- * 

+ *

  * @see LibraryReader

  * @see ASTParser

  */

@@ -89,7 +89,7 @@ public class JavaReader implements IModelReader {
 

 	/**

 	 * Constructs a {@code JavaReader}.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF factory

 	 * @param options

@@ -199,7 +199,7 @@ public class JavaReader implements IModelReader {
 

 	/**

 	 * Indicate if a element is excluded from analyse (user filter choice)

-	 * 

+	 *

 	 * @param qualifiedName

 	 *            the qualified name of the element

 	 * @return

@@ -213,7 +213,7 @@ public class JavaReader implements IModelReader {
 

 	/**

 	 * Indicate if a qualified name is included in analyse (user filter choice)

-	 * 

+	 *

 	 * @param qualifiedName

 	 *            the qualified name of the element

 	 * @return

@@ -228,7 +228,7 @@ public class JavaReader implements IModelReader {
 	/**

 	 * Computes if a package does not contain any types to be analyzed

 	 * (according to user filter choice)

-	 * 

+	 *

 	 * @param aPackage

 	 * @return

 	 * @throws JavaModelException

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/MethodRedefinitionManager.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/MethodRedefinitionManager.java
index c9d0eafba..27d70eba8 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/MethodRedefinitionManager.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/MethodRedefinitionManager.java
@@ -42,7 +42,7 @@ public final class MethodRedefinitionManager {
 

 	/**

 	 * consolidates the model with redefinitions links between methods

-	 * 

+	 *

 	 * @param model

 	 * @param facto

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/Binding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/Binding.java
index fa223c347..649895dbb 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/Binding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/Binding.java
@@ -25,7 +25,7 @@ import org.eclipse.jdt.core.dom.IBinding;
  * (fully qualified name for global entities (types, methods, ...) and number

  * for local variables).

  * </p>

- * 

+ *

  * @see IBinding

  */

 public class Binding {

@@ -48,7 +48,7 @@ public class Binding {
 	/**

 	 * Returns an unique identifier for the Java entity represented by this

 	 * binding.

-	 * 

+	 *

 	 * @return an unique identifier (fully qualified name for global entities

 	 *         (types, methods, ...) and number for local variables)

 	 */

@@ -60,7 +60,7 @@ public class Binding {
 	/**

 	 * Indicate if this binding represents an unresolved Java entity. An

 	 * unresolved binding only knows the name of the Java entity.

-	 * 

+	 *

 	 * @return {@code true} if this binding is unresolved, {@code false}

 	 *         otherwise

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/BindingManager.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/BindingManager.java
index 409c4f7dc..00737ac00 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/BindingManager.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/BindingManager.java
@@ -62,7 +62,7 @@ import org.eclipse.modisco.java.discoverer.internal.JavaActivator;
  * After resolving pending references, the targets of the remaining references

  * are created as {@link org.eclipse.gmt.modisco.java.NamedElement#isProxy()

  * proxies}.

- * 

+ *

  * @see #resolveBindings(Model)

  * @see PendingElement#affectTarget(ASTNode)

  */

@@ -97,7 +97,7 @@ public class BindingManager {
 

 	/**

 	 * Constructs an empty {@code BindingManager}.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF factory

 	 */

@@ -108,7 +108,7 @@ public class BindingManager {
 	/**

 	 * Constructs a {@code BindingManager} containing the factory, the targets

 	 * and the pending references of the specified {@code BindingManager}.

-	 * 

+	 *

 	 * @param aBindingManager

 	 *            an other {@code BindingManager}

 	 */

@@ -121,7 +121,7 @@ public class BindingManager {
 

 	/**

 	 * Enable incremental behavior.

-	 * 

+	 *

 	 * @param model1

 	 */

 	public void enableIncrementalDiscovering(final Model model1) {

@@ -137,7 +137,7 @@ public class BindingManager {
 

 	/**

 	 * Return true if incremental behavior is enabled.

-	 * 

+	 *

 	 * @return true if incremental behavior is enabled

 	 */

 	public boolean isIncrementalDiscovering() {

@@ -147,7 +147,7 @@ public class BindingManager {
 	/**

 	 * Add the Java entity {@code target} represented by the {@code binding} to

 	 * the targets of this BindingManager.

-	 * 

+	 *

 	 * @param binding

 	 *            the string representation of the {@code Binding}

 	 * @param target

@@ -160,7 +160,7 @@ public class BindingManager {
 	/**

 	 * Add the Java entity {@code target} represented by the {@code binding} to

 	 * the targets of this BindingManager.

-	 * 

+	 *

 	 * @param binding

 	 *            the string representation of the {@code Binding}

 	 * @param target

@@ -173,7 +173,7 @@ public class BindingManager {
 	/**

 	 * Indicate if a {@code NamedElement} representated by the {@code binding}

 	 * is contained in this BindingManager.

-	 * 

+	 *

 	 * @param binding

 	 *            the string representation of a {@code Binding} representating

 	 *            the searched Java entity

@@ -199,7 +199,7 @@ public class BindingManager {
 	/**

 	 * Indicate if a {@code NamedElement} representated by the {@code binding}

 	 * is contained in this BindingManager.

-	 * 

+	 *

 	 * @param binding

 	 *            a {@code Binding} representating the searched Java entity.

 	 * @return {@code true} if this BindingManager contains a

@@ -212,7 +212,7 @@ public class BindingManager {
 

 	/**

 	 * Returns the {@code NamedElement} represented by the {@code Binding}.

-	 * 

+	 *

 	 * @param binding

 	 *            a {@code Binding} representating the searched Java entity.

 	 * @return the {@code NamedElement} associated with the {@code binding}, or

@@ -238,7 +238,7 @@ public class BindingManager {
 

 	/**

 	 * Returns the {@code NamedElement} represented by the {@code Binding}.

-	 * 

+	 *

 	 * @param binding

 	 *            a {@code Binding} representating the searched Java entity.

 	 * @return the {@code NamedElement} associated with the {@code binding}, or

@@ -256,7 +256,7 @@ public class BindingManager {
 	/**

 	 * Add a pending reference representated by a {@code PendingElement} to this

 	 * {@code BindingManager}.

-	 * 

+	 *

 	 * @param ref

 	 *            the {@code PendingElement} object

 	 * @param binding

@@ -271,7 +271,7 @@ public class BindingManager {
 	 * Returns the {@link PendingElement} contained in this

 	 * {@code BindingManager} specified by the {@code clientNode} and the

 	 * {@code linkName}.

-	 * 

+	 *

 	 * @param clientNode

 	 *            the client node

 	 * @param linkName

@@ -295,7 +295,7 @@ public class BindingManager {
 	 * Resolution of the pending references against the targets of this

 	 * {@code BindingManager}. if {@code model} is {@code null}, the unresolved

 	 * bindings will not be computed.

-	 * 

+	 *

 	 * @param model1

 	 *            the resulting {@link Model}.

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ClassBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ClassBinding.java
index 0dcd2471a..267cd5f90 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ClassBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ClassBinding.java
@@ -23,7 +23,7 @@ import org.eclipse.jdt.core.dom.ITypeBinding;
 

 /**

  * {@code Binding} representing a type (Class, Interface, Annotation, or Enum).

- * 

+ *

  * @see ITypeBinding

  */

 public class ClassBinding extends Binding {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FeatureBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FeatureBinding.java
index ab3c37f8c..5a2120787 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FeatureBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FeatureBinding.java
@@ -18,7 +18,7 @@ package org.eclipse.modisco.java.discoverer.internal.io.java.binding;
 

 /**

  * <code>Binding</code> representing a featured Java entity.

- * 

+ *

  */

 public abstract class FeatureBinding extends Binding {

 

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FieldBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FieldBinding.java
index f0d71b136..20e403003 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FieldBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/FieldBinding.java
@@ -20,7 +20,7 @@ import org.eclipse.jdt.core.dom.IVariableBinding;
 

 /**

  * <code>Binding</code> representing a field.

- * 

+ *

  * @see IVariableBinding

  */

 public class FieldBinding extends FeatureBinding {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/IBindingFactory.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/IBindingFactory.java
index a5a31a414..e48fe2a8d 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/IBindingFactory.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/IBindingFactory.java
@@ -27,7 +27,7 @@ import org.eclipse.jdt.core.dom.WildcardType;
 

 /**

  * A Factory which creates MoDisco {@link Binding}s from JDT nodes.

- * 

+ *

  * @see org.eclipse.jdt.core.dom.ASTNode

  */

 public interface IBindingFactory {

@@ -35,7 +35,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to the Java entity

 	 * represented by the JDT {@code name}.

-	 * 

+	 *

 	 * @param name

 	 *            the JDT name.

 	 * @return the MoDisco {@code Binding}.

@@ -45,7 +45,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to the JDT

 	 * PrimitiveType {@code type}.

-	 * 

+	 *

 	 * @param type

 	 *            the JDT PrimitiveType object.

 	 * @return the MoDisco {@code Binding}.

@@ -55,7 +55,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to the JDT WildcardType

 	 * {@code type}.

-	 * 

+	 *

 	 * @param type

 	 *            the JDT WildcardType object.

 	 * @return the MoDisco {@code Binding}.

@@ -65,7 +65,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to the JDT

 	 * ParameterizedType {@code type}.

-	 * 

+	 *

 	 * @param type

 	 *            the JDT ParameterizedType object.

 	 * @return the MoDisco {@code Binding}.

@@ -75,7 +75,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to the JDT ArrayType

 	 * {@code type}.

-	 * 

+	 *

 	 * @param type

 	 *            the JDT ArrayType object.

 	 * @return the MoDisco {@code Binding}.

@@ -85,7 +85,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to a constructor call

 	 * (basically, a {@link MethodBinding}).

-	 * 

+	 *

 	 * @param constructorCall

 	 *            the JDT ClassInstanceCreation object.

 	 * @return the MoDisco {@code Binding}.

@@ -95,7 +95,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to a constructor call

 	 * (basically, a {@link MethodBinding}).

-	 * 

+	 *

 	 * @param constructorCall

 	 *            the JDT ConstructorInvocation object.

 	 * @return the MoDisco {@code Binding}.

@@ -105,7 +105,7 @@ public interface IBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to a super constructor

 	 * call (basically, a {@link MethodBinding}).

-	 * 

+	 *

 	 * @param constructorCall

 	 *            the JDT SuperConstructorInvocation object.

 	 * @return the MoDisco {@code Binding}.

@@ -119,7 +119,7 @@ public interface IBindingFactory {
 	 * <li>local variable (declared in a method body or an initializer)</li>

 	 * <li>local method (declared in an anonymous class)</li>

 	 * </ul>

-	 * 

+	 *

 	 * @param name

 	 *            the JDT name.

 	 * @return {@code true} if this {@code name} represents a local variable or

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/JDTDelegateBindingFactory.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/JDTDelegateBindingFactory.java
index 1462c1725..998231ac2 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/JDTDelegateBindingFactory.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/JDTDelegateBindingFactory.java
@@ -36,7 +36,7 @@ import org.eclipse.modisco.java.discoverer.internal.Messages;
 

 /**

  * A factory which uses the JDT Binding API to build MoDisco {@link Binding}s.

- * 

+ *

  * @see IBinding

  * @see ASTParser#setResolveBindings(boolean)

  */

@@ -57,7 +57,7 @@ public final class JDTDelegateBindingFactory implements IBindingFactory {
 

 	/**

 	 * Returns the unique instance of this factory.

-	 * 

+	 *

 	 * @return the instance.

 	 */

 	public static IBindingFactory getInstance() {

@@ -259,7 +259,7 @@ public final class JDTDelegateBindingFactory implements IBindingFactory {
 			/*

 			 * we don't want type variables or generic types in parameter

 			 * bindings, so we replace it by the erasure

-			 * 

+			 *

 			 * @see org.eclipse.jdt.core.dom.ITypeBinding#getErasure()

 			 */

 			if (binding.getErasure() != null) {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/MethodBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/MethodBinding.java
index 02f09ee0e..ed81beceb 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/MethodBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/MethodBinding.java
@@ -23,7 +23,7 @@ import org.eclipse.jdt.core.dom.IMethodBinding;
 

 /**

  * <code>Binding</code> representing a Java method.

- * 

+ *

  * @see IMethodBinding

  */

 public class MethodBinding extends FeatureBinding {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PackageBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PackageBinding.java
index c8a2d5137..4af5e3e58 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PackageBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PackageBinding.java
@@ -20,7 +20,7 @@ import org.eclipse.jdt.core.dom.IPackageBinding;
 

 /**

  * {@code Binding} representing a Java package.

- * 

+ *

  * @see IPackageBinding

  */

 public class PackageBinding extends Binding {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ParameterBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ParameterBinding.java
index fc2d72678..050ab4d4c 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ParameterBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/ParameterBinding.java
@@ -18,7 +18,7 @@ package org.eclipse.modisco.java.discoverer.internal.io.java.binding;
 

 /**

  * <code>Binding</code> representing a method parameter.

- * 

+ *

  */

 public class ParameterBinding extends Binding {

 

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java
index 0e5c20992..ec201914d 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/PendingElement.java
@@ -90,7 +90,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * The constructor.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF factory

 	 */

@@ -100,7 +100,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * Returns the client node of this reference.

-	 * 

+	 *

 	 * @return the client node

 	 */

 	public ASTNode getClientNode() {

@@ -109,7 +109,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * Set the client node of this reference.

-	 * 

+	 *

 	 * @param clientNode

 	 *            the client node

 	 */

@@ -119,7 +119,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * Returns the {@link EStructuralFeature feature}'s name of this reference.

-	 * 

+	 *

 	 * @see org.eclipse.emf.ecore.EClass#getEStructuralFeature(String)

 	 * @return the feature's name.

 	 */

@@ -129,7 +129,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * Set the {@link EStructuralFeature feature}'s name of this reference.

-	 * 

+	 *

 	 * @param linkName

 	 *            the string name of the feature

 	 */

@@ -139,7 +139,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * Returns the {@code Binding} representing the targeted Java entity.

-	 * 

+	 *

 	 * @return the binding

 	 */

 	public Binding getBinding() {

@@ -148,7 +148,7 @@ public class PendingElement implements ASTNode {
 

 	/**

 	 * Set the {@code Binding} representing the targeted Java entity.

-	 * 

+	 *

 	 * @param binding

 	 *            the binding

 	 */

@@ -159,7 +159,7 @@ public class PendingElement implements ASTNode {
 	/**

 	 * Affect the given {@code target} to the client node. This method use the

 	 * EMF reflexive API.

-	 * 

+	 *

 	 * @param target

 	 *            the target.

 	 */

@@ -185,7 +185,7 @@ public class PendingElement implements ASTNode {
 		// Temporary workaround : affect unresolvedMethod with name matching the AnnotationTypeMemberDeclaration

 		if (target.getOriginalCompilationUnit() != null

 				&& target.getOriginalCompilationUnit().getPackage() != null

-				&& target.getOriginalCompilationUnit().getPackage().getModel() != null) { 

+				&& target.getOriginalCompilationUnit().getPackage().getModel() != null) {

 			final NamedElement method = affectUnresolvedTarget();

 			target.getOriginalCompilationUnit().getPackage().getModel().getUnresolvedItems().add((UnresolvedItem) method);

 			method.setName(JavaUtil.getQualifiedName(target));

@@ -228,7 +228,7 @@ public class PendingElement implements ASTNode {
 	 * <p>

 	 * It will fall back to the generic {@code UnresolvedItem} meta-class for

 	 * unkown client nodes.

-	 * 

+	 *

 	 * @return an UnresolvedItem compatible with the feature's type of the

 	 *         clientNode.

 	 */

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/UnresolvedBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/UnresolvedBinding.java
index adf4d454a..64e6f5eaa 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/UnresolvedBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/UnresolvedBinding.java
@@ -18,7 +18,7 @@ package org.eclipse.modisco.java.discoverer.internal.io.java.binding;
 

 /**

  * {@code Binding} representing a Java entity which is unresolved.

- * 

+ *

  */

 public class UnresolvedBinding extends Binding {

 

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/VariableBinding.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/VariableBinding.java
index 8f69a807f..92b09a811 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/VariableBinding.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/java/binding/VariableBinding.java
@@ -20,7 +20,7 @@ import org.eclipse.jdt.core.dom.IVariableBinding;
 

 /**

  * {@code Binding} representing a local variable.

- * 

+ *

  * @see IVariableBinding

  */

 public class VariableBinding extends Binding {

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParser.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParser.java
index 5b84a5be5..a064ce698 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParser.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParser.java
@@ -75,7 +75,7 @@ import org.eclipse.modisco.java.discoverer.internal.io.library.binding.JavaModel
 /**

  * The main class for populating the Java model from the JDT Java model of

  * {@link IClassFile class files}.

- * 

+ *

  * @see Model

  */

 public class ClassFileParser {

@@ -134,7 +134,7 @@ public class ClassFileParser {
 	/**

 	 * Finds the type variable associated with the currently visited Java

 	 * element (type or method) or with it's parent.

-	 * 

+	 *

 	 * @param name

 	 *            the name of the type variable

 	 * @return the {@code ITypeParameter}

@@ -200,7 +200,7 @@ public class ClassFileParser {
 

 	/**

 	 * Creation of the {@link ClassFile} object

-	 * 

+	 *

 	 * @param classFile

 	 */

 	protected void visitClassFile(final IClassFile classFile) {

@@ -216,7 +216,7 @@ public class ClassFileParser {
 

 	/**

 	 * Visit the members (fields, methods and types) of the {@code type}.

-	 * 

+	 *

 	 * @param type

 	 *            the java model {@code IType}

 	 * @param enclosingType

@@ -279,7 +279,7 @@ public class ClassFileParser {
 

 	/**

 	 * Visit the package of the class file.

-	 * 

+	 *

 	 * @param packageFragment

 	 *            the {@code IPackageFragment}

 	 */

@@ -355,7 +355,7 @@ public class ClassFileParser {
 

 	/**

 	 * Visit the properties of an {@code IType}.

-	 * 

+	 *

 	 * @param type

 	 *            the {@code IType}

 	 * @return the {@link AbstractTypeDeclaration} object corresponding to the

@@ -428,7 +428,7 @@ public class ClassFileParser {
 

 	/**

 	 * Visit a {@code IField}.

-	 * 

+	 *

 	 * @param field

 	 *            the {@code IField}

 	 * @return the {@link FieldDeclaration} object corresponding to the

@@ -520,7 +520,7 @@ public class ClassFileParser {
 

 	/**

 	 * Visit a {@code IMethod}.

-	 * 

+	 *

 	 * @param method

 	 *            the {@code IMethod}

 	 * @return the {@link AbstractMethodDeclaration} object corresponding to the

@@ -913,7 +913,7 @@ public class ClassFileParser {
 	 * </p>

 	 * So, the returned {@code TypeAccess} may or may not have a resolved

 	 * {@link TypeAccess#getType() type}.

-	 * 

+	 *

 	 * @param qualifiedName

 	 *            the signature of the referenced type (eg : [I,

 	 *            Ljava.lang.Object;)

@@ -1062,7 +1062,7 @@ public class ClassFileParser {
 

 	/**

 	 * Complete the MoDisco modifier with the informations of the flags.

-	 * 

+	 *

 	 * @param flags

 	 *            the flags

 	 * @param modiscoModifier

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParserUtils.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParserUtils.java
index 7d043a83c..49d388bf0 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParserUtils.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/ClassFileParserUtils.java
@@ -39,7 +39,7 @@ public final class ClassFileParserUtils {
 	/**

 	 * Resolves the Java model element and sorts the targeted

 	 * <code>element</code> in the global <code>BindingManager</code>.

-	 * 

+	 *

 	 * @param element

 	 *            the declared Java entity.

 	 * @param javaElement

@@ -60,7 +60,7 @@ public final class ClassFileParserUtils {
 	 * reference is resolved and the supplied {@code TypeAccess} is completed.

 	 * If unknown, a pending reference is created and sorted in the global

 	 * {@code BindingManager}.

-	 * 

+	 *

 	 * @param element

 	 *            the {@code TypeAccess} associated with this reference

 	 * @param name

@@ -86,7 +86,7 @@ public final class ClassFileParserUtils {
 	/**

 	 * First creation of the Java primitives types which are placed as targets

 	 * in the global {@code BindingManager}.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF {@code factory}

 	 * @param model

@@ -172,7 +172,7 @@ public final class ClassFileParserUtils {
 

 	/**

 	 * Returns the string as it would be in the source code.

-	 * 

+	 *

 	 * @see org.eclipse.jdt.core.dom.StringLiteral#getEscapedValue

 	 */

 	public static String escapeString(final String value) {

@@ -241,7 +241,7 @@ public final class ClassFileParserUtils {
 

 	/**

 	 * Returns the character as it would be in the source code.

-	 * 

+	 *

 	 * @see org.eclipse.jdt.core.dom.CharacterLiteral#getEscapedValue

 	 */

 	public static String escapeCharacter(final char value) {

@@ -306,7 +306,7 @@ public final class ClassFileParserUtils {
 

 	/**

 	 * Indicate if a type signature corresponds to the {@link Object} type.

-	 * 

+	 *

 	 * @param signature

 	 *            the signature

 	 * @return {@code true} if the supplied signature corresponds to the Object

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/LibraryReader.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/LibraryReader.java
index 535ed50f0..f7fe6c832 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/LibraryReader.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/LibraryReader.java
@@ -66,7 +66,7 @@ import org.eclipse.modisco.java.discoverer.internal.io.java.binding.BindingManag
  * {@link LibraryReaderOptions#USE_SOURCES USE_SOURCES} option will cause the

  * creation of the model from the sources, relying on a {@code JavaReader}.

  * </p>

- * 

+ *

  * @see JavaReader

  */

 public class LibraryReader implements IModelReader {

@@ -104,7 +104,7 @@ public class LibraryReader implements IModelReader {
 

 	/**

 	 * Contructs a new {@code LibraryReader} with no options.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF factory

 	 * @param library

@@ -116,7 +116,7 @@ public class LibraryReader implements IModelReader {
 

 	/**

 	 * Contructs a new {@code LibraryReader} with options.

-	 * 

+	 *

 	 * @param factory

 	 *            the EMF factory

 	 * @param library

@@ -269,7 +269,7 @@ public class LibraryReader implements IModelReader {
 	 * {@link IPackageFragmentRoot#isArchive() archive} in which this class file

 	 * is contained. If a corresponding archive is present in the {@code model},

 	 * it is returned, or a new one is created and added to the {@code model}.

-	 * 

+	 *

 	 * @param classFile

 	 *            the class file

 	 * @param factory

@@ -307,7 +307,7 @@ public class LibraryReader implements IModelReader {
 	 * is in an archive (workspace or external), the path will be the path

 	 * inside the archive. If it is in a folder (workspace or external), the

 	 * path will be the full absolute path to this class file.

-	 * 

+	 *

 	 * @param classFile

 	 *            the class file

 	 * @return the archive-relative path

@@ -334,7 +334,7 @@ public class LibraryReader implements IModelReader {
 

 	/**

 	 * Returns the absolute path of this library in the filesystem.

-	 * 

+	 *

 	 * @param library

 	 *            the library

 	 * @return the absolute path of this library

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/TypeFinder.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/TypeFinder.java
index 414c30b3e..7b42b8c54 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/TypeFinder.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/TypeFinder.java
@@ -46,7 +46,7 @@ public class TypeFinder {
 

 	/**

 	 * Returns the {@link IType} corresponding to the supplied qualified name.

-	 * 

+	 *

 	 * @param qualifiedName

 	 *            the dot based qualified name ({@code java.lang.String} for

 	 *            example)

@@ -81,7 +81,7 @@ public class TypeFinder {
 

 	/**

 	 * Indicate if the designated type name has a corresponding {@code IType}.

-	 * 

+	 *

 	 * @param qualifiedName

 	 *            the dot based qualified name ({@code java.lang.String} for

 	 *            example)

diff --git a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/binding/JavaModelDelegateBindingFactory.java b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/binding/JavaModelDelegateBindingFactory.java
index 15d1aa57d..f60a03eae 100644
--- a/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/binding/JavaModelDelegateBindingFactory.java
+++ b/org.eclipse.modisco.java.discoverer/src/org/eclipse/modisco/java/discoverer/internal/io/library/binding/JavaModelDelegateBindingFactory.java
@@ -38,7 +38,7 @@ import org.eclipse.modisco.java.discoverer.internal.io.library.ClassFileParser;
 

 /**

  * A factory which uses the Java Model API to build MoDisco {@link Binding}s.

- * 

+ *

  */

 public final class JavaModelDelegateBindingFactory {

 

@@ -62,7 +62,7 @@ public final class JavaModelDelegateBindingFactory {
 

 	/**

 	 * Returns the unique instance of this factory.

-	 * 

+	 *

 	 * @return the instance.

 	 */

 	public static JavaModelDelegateBindingFactory getInstance() {

@@ -77,7 +77,7 @@ public final class JavaModelDelegateBindingFactory {
 	 * {@code ClassBinding} will only have a non-parameterized readable

 	 * {@link ClassBinding#toString() name} (eg : {@code java.lang.ArrayList})

 	 * </p>

-	 * 

+	 *

 	 * @param sig

 	 *            the java signature (eg : {@code Ljava.lang.Object;})

 	 * @param visitor

@@ -139,7 +139,7 @@ public final class JavaModelDelegateBindingFactory {
 	/**

 	 * Returns the MoDisco {@link Binding} corresponding to the Java entity

 	 * represented by the Java Model element.

-	 * 

+	 *

 	 * @param element

 	 *            the Java Model element

 	 * @param visitor

diff --git a/org.eclipse.modisco.java.generation.tests/.checkstyle b/org.eclipse.modisco.java.generation.tests/.checkstyle
index a7fa2bcbf..f8f865f39 100644
--- a/org.eclipse.modisco.java.generation.tests/.checkstyle
+++ b/org.eclipse.modisco.java.generation.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java
index 5f4d88fec..eaecdbf47 100644
--- a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java
+++ b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/JavaFileComparator.java b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/JavaFileComparator.java
index 1a30f7020..790bb66c6 100644
--- a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/JavaFileComparator.java
+++ b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/JavaFileComparator.java
@@ -23,7 +23,7 @@ import com.ibm.icu.lang.UCharacter;
 /**

  * Specific file comparator for java files generated : compare char by char,

  * ignore white spaces (tab, line feeds, ...).

- * 

+ *

  */

 public class JavaFileComparator implements Comparator<File> {

 

diff --git a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/TestGlobal001.java b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/TestGlobal001.java
index 24a542b8e..e597fff08 100644
--- a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/TestGlobal001.java
+++ b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/TestGlobal001.java
@@ -55,7 +55,7 @@ public class TestGlobal001 extends DiffGeneratedJavaTest {
 	/**

 	 * Launch a java files generation, and compares result with from reference

 	 * java files.

-	 * 

+	 *

 	 * @throws URISyntaxException

 	 * @throws IOException

 	 * @throws CoreException

diff --git a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/utils/DiffGeneratedJavaTest.java b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/utils/DiffGeneratedJavaTest.java
index 657fcee6b..a44986ed9 100644
--- a/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/utils/DiffGeneratedJavaTest.java
+++ b/org.eclipse.modisco.java.generation.tests/src/org/eclipse/modisco/java/generation/tests/utils/DiffGeneratedJavaTest.java
@@ -43,7 +43,7 @@ import org.osgi.framework.Bundle;
 /**

  * Test on generated java files from javaxmi model file. Generated java code is

  * compared char by char (excluding white spaces).

- * 

+ *

  */

 public abstract class DiffGeneratedJavaTest {

 

@@ -57,7 +57,7 @@ public abstract class DiffGeneratedJavaTest {
 					".java")); //$NON-NLS-1$

 		}

 	}

-	

+

 	protected abstract String getJavaXmiFilePath();

 

 	/**

@@ -74,11 +74,11 @@ public abstract class DiffGeneratedJavaTest {
 		File xmlFile = iFile.getLocation().toFile();

 		return xmlFile;

 	}

-	

+

 	protected abstract String getCodeSourceReferencePath();

 	protected abstract Bundle getCodeSourceReferenceBundle();

 	protected abstract String getDeployedCodeSourceReferencePath();

-	

+

 

 	/**

 	 * Get the Java code reference folder

@@ -151,7 +151,7 @@ public abstract class DiffGeneratedJavaTest {
 

 	/**

 	 * Get The target folder for java generation

-	 * 

+	 *

 	 * @return

 	 */

 	protected File prepareOutputDirectory() {

@@ -193,7 +193,7 @@ public abstract class DiffGeneratedJavaTest {
 

 	/**

 	 * Gets a IProject for deploying tests resources.

-	 * 

+	 *

 	 * @return

 	 * @throws CoreException

 	 */

diff --git a/org.eclipse.modisco.java.queries.tests/.checkstyle b/org.eclipse.modisco.java.queries.tests/.checkstyle
index 1d9ce8d76..334787e7d 100644
--- a/org.eclipse.modisco.java.queries.tests/.checkstyle
+++ b/org.eclipse.modisco.java.queries.tests/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
    </fileset>
diff --git a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java
index 3f987b9e0..8d3b980a9 100644
--- a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java
+++ b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

@@ -28,7 +28,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -41,7 +41,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -54,7 +54,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Bug308303Test.java b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Bug308303Test.java
index 1a1275034..75b639a7d 100644
--- a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Bug308303Test.java
+++ b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/Bug308303Test.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

@@ -56,12 +56,12 @@ public class Bug308303Test {
 				if (eObject instanceof CatchClause) {

 					// catch (Exception theException) {...}

 					SingleVariableDeclaration exceptionVariable = ((CatchClause) eObject).getException();

-					

+

 					modelQueryImpl = catalog

 								.getModelQueryImpl(queryGetQualifiedName);

 					String qName = (String) modelQueryImpl.basicEvaluate(exceptionVariable);

 					Assert.assertTrue(qName != null && qName.equals("theException")); // qname must be "e" //$NON-NLS-1$

-					

+

 				}

 			}

 	}

diff --git a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/ModifierJavaQueriesTest.java b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/ModifierJavaQueriesTest.java
index e7bd27c73..79360c3e9 100644
--- a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/ModifierJavaQueriesTest.java
+++ b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/ModifierJavaQueriesTest.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

diff --git a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/TextJavaQueriesTest.java b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/TextJavaQueriesTest.java
index 10232b03f..e534b0d99 100644
--- a/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/TextJavaQueriesTest.java
+++ b/org.eclipse.modisco.java.queries.tests/src/org/eclipse/modisco/java/queries/tests/TextJavaQueriesTest.java
@@ -4,7 +4,7 @@
  * 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:

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

  *     Gregoire DUPE (Mia-Software)

@@ -52,7 +52,7 @@ public class TextJavaQueriesTest {
 	/**

 	 * Call a unit test which imports org.eclipse.gmt.modisco.java.queries

 	 * before to call the test textJavaQueriesTest().

-	 * 

+	 *

 	 * @throws Exception

 	 */

 	@Test

@@ -182,7 +182,7 @@ public class TextJavaQueriesTest {
 					modelQueryImpl = catalog.getModelQueryImpl(queryGetMethodDeclarationText);

 					result = (String) modelQueryImpl.basicEvaluate(methDecl);

 					Assert.assertEquals(result,

-							TextJavaQueriesTest.NONE_NATIVE_INT_PARAM1_INT_PARAM2); 

+							TextJavaQueriesTest.NONE_NATIVE_INT_PARAM1_INT_PARAM2);

 				}

 			} else if (eObject instanceof ConstructorDeclaration) {

 				ConstructorDeclaration constDecl = (ConstructorDeclaration) eObject;

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/.checkstyle b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/.checkstyle
index 9e378825c..690d2b413 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/.checkstyle
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/.checkstyle
@@ -1,5 +1,5 @@
  <fileset-config file-format-version="1.2.0" simple-config="true">

-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

      <file-match-pattern match-pattern="." include-pattern="true"/>

      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/AllTestsInUIThread.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/AllTestsInUIThread.java
index aed276a0d..de71e28f8 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/AllTestsInUIThread.java
@@ -4,7 +4,7 @@
  * 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:

  *		Nicolas Guyomar (Mia-Software) - initial API and implementation

  *		Nicolas Bros (Mia-Software) - adapted to new discovery framework

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/JUnitPlugin.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/JUnitPlugin.java
index 3c47cf913..24c6fbd25 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/JUnitPlugin.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/JUnitPlugin.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -34,7 +34,7 @@ public class JUnitPlugin extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

 	 */

@@ -46,7 +46,7 @@ public class JUnitPlugin extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

@@ -58,7 +58,7 @@ public class JUnitPlugin extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JUnitPlugin getDefault() {

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar11.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar11.java
index 6bd6b1a1d..38ae410e0 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar11.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar11.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -90,7 +90,7 @@ public class TestEjbJar11 {
 			Assert.assertTrue(sessionType.getEjbClass().getMixed().getValue(0).toString()

 					.equalsIgnoreCase("ejb-class-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getSessionType().getMixed().getValue(0).toString()

-					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getTransactionType().getMixed().getValue(0).toString()

 					.equalsIgnoreCase("transaction-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getDescription().getMixed().getValue(0).toString()

@@ -111,7 +111,7 @@ public class TestEjbJar11 {
 			Assert.assertTrue(entityType.getPrimKeyClass().getMixed().getValue(0).toString()

 					.equalsIgnoreCase("prim-key-class-example")); //$NON-NLS-1$

 			Assert.assertTrue(entityType.getReentrant().getMixed().getValue(0).toString()

-					.equalsIgnoreCase("True")); //$NON-NLS-1$					

+					.equalsIgnoreCase("True")); //$NON-NLS-1$

 		}

 	}

 

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar20.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar20.java
index bb5abaea7..1f3cce228 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar20.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar20.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -89,7 +89,7 @@ public class TestEjbJar20 {
 			Assert.assertTrue(sessionType.getEjbClass().getMixed().getValue(0).toString()

 					.equalsIgnoreCase("ejb-class-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getSessionType().getMixed().getValue(0).toString()

-					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getTransactionType().getMixed().getValue(0).toString()

 					.equalsIgnoreCase("transaction-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getDescription().getMixed().getValue(0).toString()

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar21.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar21.java
index 3eb591b4c..329d3840a 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar21.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar21.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -91,7 +91,7 @@ public class TestEjbJar21 {
 			Assert.assertTrue(sessionType.getEjbClass().getValue().toString()

 					.equalsIgnoreCase("ejb-class-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getSessionType().getValue().toString()

-					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getTransactionType().getValue().toString()

 					.equalsIgnoreCase("transaction-type-example")); //$NON-NLS-1$

 

@@ -108,7 +108,7 @@ public class TestEjbJar21 {
 			Assert.assertTrue(entityType.getPersistenceType().getValue().toString()

 					.equalsIgnoreCase("persistence-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(entityType.getPrimKeyClass().getValue().toString()

-					.equalsIgnoreCase("prim-key-class-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("prim-key-class-example")); //$NON-NLS-1$

 

 		}

 	}

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar30.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar30.java
index d0a7dc6e9..10b88bff1 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar30.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar30.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -84,17 +84,17 @@ public class TestEjbJar30 {
 			// Session Type Test

 			SessionBeanType sessionType = entBean.getSession().get(0);

 			Assert.assertTrue(sessionType.getEjbName().getValue().toString()

-					.equalsIgnoreCase("ejb-name-example")); //$NON-NLS-1$	

+					.equalsIgnoreCase("ejb-name-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getServiceEndpoint().getValue().toString()

-					.equalsIgnoreCase("service-endpoint-example")); //$NON-NLS-1$	

+					.equalsIgnoreCase("service-endpoint-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getBusinessLocal().get(0).getValue().toString()

 					.equalsIgnoreCase("business-local-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getBusinessRemote().get(0).getValue().toString()

-					.equalsIgnoreCase("business-remote-example")); //$NON-NLS-1$	

+					.equalsIgnoreCase("business-remote-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getEjbClass().getValue().toString()

 					.equalsIgnoreCase("ejb-class-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getSessionType().getValue().toString()

-					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getTransactionType().getValue().toString()

 					.equalsIgnoreCase("transaction-type-example")); //$NON-NLS-1$

 

@@ -143,7 +143,7 @@ public class TestEjbJar30 {
 					.equalsIgnoreCase("field-name-example")); //$NON-NLS-1$

 

 			Assert.assertTrue(entityType.getQuery().get(0).getQueryMethod().getMethodName()

-					.getValue().toString().equalsIgnoreCase("method-name-example")); //$NON-NLS-1$			

+					.getValue().toString().equalsIgnoreCase("method-name-example")); //$NON-NLS-1$

 			Assert.assertTrue(entityType.getQuery().get(0).getQueryMethod().getMethodParams()

 					.getMethodParam().get(0).getValue().toString()

 					.equalsIgnoreCase("method-param-example")); //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar31.java b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar31.java
index bad0ed8c9..73695a80a 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar31.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/src/org/eclipse/modisco/jee/ejbjar/discoverer/tests/TestEjbJar31.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -84,7 +84,7 @@ public class TestEjbJar31 {
 			// Session Type Test

 			SessionBeanType sessionType = entBean.getSession().get(0);

 			Assert.assertTrue(sessionType.getEjbName().getValue().toString()

-					.equalsIgnoreCase("ejb-name-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("ejb-name-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getServiceEndpoint().getValue().toString()

 					.equalsIgnoreCase("service-endpoint-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getBusinessLocal().get(0).getValue().toString()

@@ -94,9 +94,9 @@ public class TestEjbJar31 {
 			Assert.assertTrue(sessionType.getEjbClass().getValue().toString()

 					.equalsIgnoreCase("ejb-class-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getSessionType().getValue().toString()

-					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("session-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(sessionType.getTransactionType().getValue().toString()

-					.equalsIgnoreCase("transaction-type-example")); //$NON-NLS-1$			

+					.equalsIgnoreCase("transaction-type-example")); //$NON-NLS-1$

 

 			// Message Driven Test

 			MessageDrivenBeanType messageDriven = entBean.getMessageDriven().get(0);

@@ -143,7 +143,7 @@ public class TestEjbJar31 {
 					.equalsIgnoreCase("field-name-example")); //$NON-NLS-1$

 

 			Assert.assertTrue(entityType.getQuery().get(0).getQueryMethod().getMethodName()

-					.getValue().toString().equalsIgnoreCase("method-name-example")); //$NON-NLS-1$			

+					.getValue().toString().equalsIgnoreCase("method-name-example")); //$NON-NLS-1$

 			Assert.assertTrue(entityType.getQuery().get(0).getQueryMethod().getMethodParams()

 					.getMethodParam().get(0).getValue().toString()

 					.equalsIgnoreCase("method-param-example")); //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/.checkstyle b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/src/org/eclipse/modisco/jee/ejbjar/discoverer/ui/Activator.java b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/src/org/eclipse/modisco/jee/ejbjar/discoverer/ui/Activator.java
index 1b89d5980..818560cbd 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/src/org/eclipse/modisco/jee/ejbjar/discoverer/ui/Activator.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/src/org/eclipse/modisco/jee/ejbjar/discoverer/ui/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer/.checkstyle b/org.eclipse.modisco.jee.ejbjar.discoverer/.checkstyle
index 9e378825c..690d2b413 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer/.checkstyle
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer/.checkstyle
@@ -1,5 +1,5 @@
  <fileset-config file-format-version="1.2.0" simple-config="true">

-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

      <file-match-pattern match-pattern="." include-pattern="true"/>

      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/EjbJarActivator.java b/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/EjbJarActivator.java
index a3494c6af..a5c19a657 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/EjbJarActivator.java
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer/src/org/eclipse/modisco/jee/ejbjar/discoverer/EjbJarActivator.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

@@ -36,7 +36,7 @@ public class EjbJarActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -49,7 +49,7 @@ public class EjbJarActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -62,7 +62,7 @@ public class EjbJarActivator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static EjbJarActivator getDefault() {

diff --git a/org.eclipse.modisco.jee.ejbjar/.checkstyle b/org.eclipse.modisco.jee.ejbjar/.checkstyle
index 3dd131e10..19fbca4ac 100644
--- a/org.eclipse.modisco.jee.ejbjar/.checkstyle
+++ b/org.eclipse.modisco.jee.ejbjar/.checkstyle
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/jee/ejbjar/EjbJar11"/>
-    <filter-data value="src/org/eclipse/modisco/jee/ejbjar/EjbJar20"/>
-    <filter-data value="src/org/eclipse/modisco/jee/ejbjar/EjbJar21"/>
-    <filter-data value="src/org/eclipse/modisco/jee/ejbjar/EjbJar30"/>
-    <filter-data value="src/org/eclipse/modisco/jee/ejbjar/EjbJar31"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.jee.ejbjar/.classpath b/org.eclipse.modisco.jee.ejbjar/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.jee.ejbjar/.classpath
+++ b/org.eclipse.modisco.jee.ejbjar/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.jee.ejbjar/build.properties b/org.eclipse.modisco.jee.ejbjar/build.properties
index dd1f9a1a9..9e1692a87 100644
--- a/org.eclipse.modisco.jee.ejbjar/build.properties
+++ b/org.eclipse.modisco.jee.ejbjar/build.properties
@@ -1,6 +1,6 @@
 

 # <copyright>

-#Copyright (c) 2010 Mia-Software.

+#Copyright (c) 2010, 2018 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

@@ -8,6 +8,7 @@
 #

 #Contributors:

 #    Nicolas Guyomar (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # </copyright>

 #

 # $Id$

@@ -19,6 +20,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.jee.ejbjar/model/ejbJar11.genmodel b/org.eclipse.modisco.jee.ejbjar/model/ejbJar11.genmodel
index 56b8384b5..e6fbcc131 100644
--- a/org.eclipse.modisco.jee.ejbjar/model/ejbJar11.genmodel
+++ b/org.eclipse.modisco.jee.ejbjar/model/ejbJar11.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+ *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="Copyright (c) 2010 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src" modelPluginID="org.eclipse.modisco.jee.ejbjar"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src-gen" modelPluginID="org.eclipse.modisco.jee.ejbjar"

     modelName="EjbJar11" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false">

   <foreignModel>../../ejb_1_1/model/ejbJar11.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.ejbjar/model/ejbJar20.genmodel b/org.eclipse.modisco.jee.ejbjar/model/ejbJar20.genmodel
index 34a70fd68..4f508aac1 100644
--- a/org.eclipse.modisco.jee.ejbjar/model/ejbJar20.genmodel
+++ b/org.eclipse.modisco.jee.ejbjar/model/ejbJar20.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+  *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="Copyright (c) 2010 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src" modelPluginID="org.eclipse.modisco.jee.ejbjar"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src-gen" modelPluginID="org.eclipse.modisco.jee.ejbjar"

     modelName="EjbJar20" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false">

   <foreignModel>../../ejb_2_0/model/ejbJar20.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.ejbjar/model/ejbJar21.genmodel b/org.eclipse.modisco.jee.ejbjar/model/ejbJar21.genmodel
index cb860f1cb..f0f55bd2b 100644
--- a/org.eclipse.modisco.jee.ejbjar/model/ejbJar21.genmodel
+++ b/org.eclipse.modisco.jee.ejbjar/model/ejbJar21.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+  *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="Copyright (c) 2010 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src" modelPluginID="org.eclipse.modisco.jee.ejbjar"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src-gen" modelPluginID="org.eclipse.modisco.jee.ejbjar"

     modelName="EjbJar21" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">

   <foreignModel>../../ejb_2_1/model/ejbJar21.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.ejbjar/model/ejbJar30.genmodel b/org.eclipse.modisco.jee.ejbjar/model/ejbJar30.genmodel
index be6ed1c50..ffce05e61 100644
--- a/org.eclipse.modisco.jee.ejbjar/model/ejbJar30.genmodel
+++ b/org.eclipse.modisco.jee.ejbjar/model/ejbJar30.genmodel
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ *  Copyright (c) 2010, 2018 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:

+ *  

+ *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+  *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

+ -->

+<?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="Copyright (c) 2010 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src" modelPluginID="org.eclipse.modisco.jee.ejbjar"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src-gen" modelPluginID="org.eclipse.modisco.jee.ejbjar"

     modelName="EjbJar30" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">

   <foreignModel>../../test30/model/ejbJar30.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.ejbjar/model/ejbJar31.genmodel b/org.eclipse.modisco.jee.ejbjar/model/ejbJar31.genmodel
index 6ed58584c..0c73ec4fa 100644
--- a/org.eclipse.modisco.jee.ejbjar/model/ejbJar31.genmodel
+++ b/org.eclipse.modisco.jee.ejbjar/model/ejbJar31.genmodel
@@ -1,7 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- 

+ *  Copyright (c) 2010, 2018 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:

+ *  

+ *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+  *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

+ -->

+<?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="Copyright (c) 2010 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src" modelPluginID="org.eclipse.modisco.jee.ejbjar"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;   &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.ejbjar/src-gen" modelPluginID="org.eclipse.modisco.jee.ejbjar"

     modelName="EjbJar31" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">

   <foreignModel>../../test31/model/ejbJar31.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/AssemblyDescriptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/AssemblyDescriptorType.java
index 5b8f660c6..5b8f660c6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/AssemblyDescriptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/AssemblyDescriptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/CmpFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/CmpFieldType.java
index fd92b172e..fd92b172e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/CmpFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/CmpFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ContainerTransactionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ContainerTransactionType.java
index d35a16943..d35a16943 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ContainerTransactionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ContainerTransactionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/DescriptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/DescriptionType.java
index 381d138b0..381d138b0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/DescriptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/DisplayNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/DisplayNameType.java
index bf7ee8eea..bf7ee8eea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/DocumentRoot.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/DocumentRoot.java
index 34e6b941d..34e6b941d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClassType.java
index f39dfe5d4..f39dfe5d4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClientJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClientJarType.java
index ef98dca8e..ef98dca8e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClientJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbClientJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Factory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Factory.java
index 308d4e731..308d4e731 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Factory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Factory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Package.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Package.java
index 95a5e455a..95a5e455a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Package.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJar11Package.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJarType.java
index 86b31879a..86b31879a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbLinkType.java
index b1efee13a..b1efee13a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbNameType.java
index 5aca63329..5aca63329 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefNameType.java
index 5ac415c3c..5ac415c3c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefType.java
index bdcf1fbfc..bdcf1fbfc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefTypeType.java
index b0cfbe1bd..b0cfbe1bd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnterpriseBeansType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnterpriseBeansType.java
index 329b57771..329b57771 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnterpriseBeansType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnterpriseBeansType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EntityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EntityType.java
index 269c623a5..269c623a5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EntityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EntityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryNameType.java
index 2a43267ee..2a43267ee 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryType.java
index 1696f8355..1696f8355 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryTypeType.java
index 6339efeba..6339efeba 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryValueType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryValueType.java
index afb3db1e0..afb3db1e0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryValueType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/EnvEntryValueType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/FieldNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/FieldNameType.java
index 29b3a0c7e..29b3a0c7e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/FieldNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/FieldNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/HomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/HomeType.java
index a5e3f48d1..a5e3f48d1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/HomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/HomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/LargeIconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/LargeIconType.java
index 367014fe0..367014fe0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/LargeIconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/LargeIconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodIntfType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodIntfType.java
index 3894c182e..3894c182e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodIntfType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodIntfType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodNameType.java
index c36ebb20a..c36ebb20a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamType.java
index 05b427fdc..05b427fdc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamsType.java
index 38795eb98..38795eb98 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodParamsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodPermissionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodPermissionType.java
index 68396b373..68396b373 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodPermissionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodPermissionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodType.java
index db7991de8..db7991de8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/MethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/PersistenceTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/PersistenceTypeType.java
index 93b904025..93b904025 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/PersistenceTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/PersistenceTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimKeyClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimKeyClassType.java
index a517d1811..a517d1811 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimKeyClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimKeyClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimkeyFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimkeyFieldType.java
index 48e123b9f..48e123b9f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimkeyFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/PrimkeyFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ReentrantType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ReentrantType.java
index 25c2515c2..25c2515c2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ReentrantType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ReentrantType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/RemoteType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/RemoteType.java
index fbd32e465..fbd32e465 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/RemoteType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/RemoteType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResAuthType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResAuthType.java
index 6343824c0..6343824c0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResAuthType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResRefNameType.java
index 1d5ce6d9e..1d5ce6d9e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResTypeType.java
index 6be83adba..6be83adba 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResourceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResourceRefType.java
index e0965dc67..e0965dc67 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleLinkType.java
index bbf770f7a..bbf770f7a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleNameType.java
index 6f9887d27..6f9887d27 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleRefType.java
index 72f6e86ef..72f6e86ef 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleType.java
index d53f191bb..d53f191bb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionType.java
index 650d2ad6b..650d2ad6b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionTypeType.java
index 1471a2d21..1471a2d21 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SessionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SmallIconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SmallIconType.java
index d860d3c7f..d860d3c7f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/SmallIconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/SmallIconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransAttributeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransAttributeType.java
index 2bc5d31d0..2bc5d31d0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransAttributeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransAttributeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransactionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransactionTypeType.java
index adea50ab0..adea50ab0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransactionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/TransactionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/AssemblyDescriptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/AssemblyDescriptorTypeImpl.java
index 1806b90ab..1806b90ab 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/AssemblyDescriptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/AssemblyDescriptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/CmpFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/CmpFieldTypeImpl.java
index 215616c50..215616c50 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/CmpFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/CmpFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ContainerTransactionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ContainerTransactionTypeImpl.java
index 38d7ec7fe..38d7ec7fe 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ContainerTransactionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ContainerTransactionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DescriptionTypeImpl.java
index d969739d0..d969739d0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DisplayNameTypeImpl.java
index 540e63a31..540e63a31 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DocumentRootImpl.java
index 7fed19fac..7fed19fac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClassTypeImpl.java
index 8f79579a7..8f79579a7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClientJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClientJarTypeImpl.java
index a0f1b4ffd..a0f1b4ffd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClientJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbClientJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11FactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11FactoryImpl.java
index 5dea81f50..5dea81f50 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11FactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11PackageImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11PackageImpl.java
index 293752fec..293752fec 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11PackageImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJar11PackageImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJarTypeImpl.java
index 9104b0dff..9104b0dff 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbLinkTypeImpl.java
index d10320ba9..d10320ba9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbNameTypeImpl.java
index d3f37a97e..d3f37a97e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefNameTypeImpl.java
index f163e3c0f..f163e3c0f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeImpl.java
index 94021238b..94021238b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeTypeImpl.java
index 041eb21f4..041eb21f4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnterpriseBeansTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnterpriseBeansTypeImpl.java
index 3cbe0c240..3cbe0c240 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnterpriseBeansTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnterpriseBeansTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EntityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EntityTypeImpl.java
index 68705a655..68705a655 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EntityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EntityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryNameTypeImpl.java
index 74acd199c..74acd199c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeImpl.java
index 9dd5b0bd7..9dd5b0bd7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeTypeImpl.java
index a75731810..a75731810 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryValueTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryValueTypeImpl.java
index ae6b51f54..ae6b51f54 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/EnvEntryValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/FieldNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/FieldNameTypeImpl.java
index ec2d43a15..ec2d43a15 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/FieldNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/FieldNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/HomeTypeImpl.java
index 1b8c4621b..1b8c4621b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/LargeIconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/LargeIconTypeImpl.java
index 052febc5d..052febc5d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/LargeIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/LargeIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodIntfTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodIntfTypeImpl.java
index eed4197b5..eed4197b5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodIntfTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodIntfTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodNameTypeImpl.java
index fbdaf0716..fbdaf0716 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamTypeImpl.java
index 855565e6c..855565e6c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamsTypeImpl.java
index eabca8286..eabca8286 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodParamsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodPermissionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodPermissionTypeImpl.java
index 993867a95..993867a95 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodPermissionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodPermissionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodTypeImpl.java
index dd4dd7bac..dd4dd7bac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/MethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PersistenceTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PersistenceTypeTypeImpl.java
index 25b8bc9d6..25b8bc9d6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PersistenceTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PersistenceTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimKeyClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimKeyClassTypeImpl.java
index e5bba5706..e5bba5706 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimKeyClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimKeyClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimkeyFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimkeyFieldTypeImpl.java
index 7ef00c548..7ef00c548 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimkeyFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/PrimkeyFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ReentrantTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ReentrantTypeImpl.java
index 9cae5a86e..9cae5a86e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ReentrantTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ReentrantTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RemoteTypeImpl.java
index 49f5fd425..49f5fd425 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResAuthTypeImpl.java
index d8086d512..d8086d512 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResRefNameTypeImpl.java
index 4a8aed6ec..4a8aed6ec 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResTypeTypeImpl.java
index 9a6116ad0..9a6116ad0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResourceRefTypeImpl.java
index ebb21ccb9..ebb21ccb9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleLinkTypeImpl.java
index 44b6d323f..44b6d323f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleNameTypeImpl.java
index 2599d352d..2599d352d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleRefTypeImpl.java
index a8302c580..a8302c580 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleTypeImpl.java
index d541aafc4..d541aafc4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeImpl.java
index b94789f73..b94789f73 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeTypeImpl.java
index abd7e986e..abd7e986e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SessionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SmallIconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SmallIconTypeImpl.java
index dff95092f..dff95092f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SmallIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/SmallIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransAttributeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransAttributeTypeImpl.java
index 309802be6..309802be6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransAttributeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransAttributeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransactionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransactionTypeTypeImpl.java
index 4f375fbfa..4f375fbfa 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransactionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/impl/TransactionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11AdapterFactory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11AdapterFactory.java
index 0d35139ea..0d35139ea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11AdapterFactory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceFactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceFactoryImpl.java
index 6d257b5ca..6d257b5ca 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceImpl.java
index cca3c2685..cca3c2685 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11Switch.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11Switch.java
index 953f21df8..953f21df8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11Switch.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11Switch.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11XMLProcessor.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11XMLProcessor.java
index 2dc5e2b3f..2dc5e2b3f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11XMLProcessor.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar11/util/EjbJar11XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/AbstractSchemaNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/AbstractSchemaNameType.java
index 5c1c17209..5c1c17209 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/AbstractSchemaNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/AbstractSchemaNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/AcknowledgeModeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/AcknowledgeModeType.java
index b39cb453a..b39cb453a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/AcknowledgeModeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/AcknowledgeModeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/AssemblyDescriptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/AssemblyDescriptorType.java
index b258ae4b8..b258ae4b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/AssemblyDescriptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/AssemblyDescriptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CascadeDeleteType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CascadeDeleteType.java
index 60f0d4244..60f0d4244 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CascadeDeleteType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CascadeDeleteType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpFieldType.java
index 2ed31f7fb..2ed31f7fb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpVersionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpVersionType.java
index dd6421d87..dd6421d87 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpVersionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmpVersionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldNameType.java
index 9a639c5a8..9a639c5a8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldType.java
index 3df2c4c69..3df2c4c69 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldTypeType.java
index b4ee512d9..b4ee512d9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/CmrFieldTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ContainerTransactionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ContainerTransactionType.java
index 361e0c010..361e0c010 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ContainerTransactionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ContainerTransactionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DescriptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DescriptionType.java
index db65b9454..db65b9454 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DescriptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DestinationTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DestinationTypeType.java
index 716968ff8..716968ff8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DestinationTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DisplayNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DisplayNameType.java
index 93499bde5..93499bde5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DocumentRoot.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DocumentRoot.java
index f26433a6e..f26433a6e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClassType.java
index 006d77e6b..006d77e6b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClientJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClientJarType.java
index 85fc1a695..85fc1a695 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClientJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbClientJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Factory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Factory.java
index 8ecb4bf86..8ecb4bf86 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Factory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Factory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Package.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Package.java
index 59533b59d..59533b59d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Package.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJar20Package.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJarType.java
index 90d0c2979..90d0c2979 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLinkType.java
index 96f54e076..96f54e076 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLocalRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLocalRefType.java
index 1ad04437f..1ad04437f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbNameType.java
index 4e37f91c5..4e37f91c5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbQlType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbQlType.java
index 4344819c9..4344819c9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbQlType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbQlType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefNameType.java
index a78fdac41..a78fdac41 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefType.java
index 08cbe1223..08cbe1223 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefTypeType.java
index b56c86225..b56c86225 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationNameType.java
index 2d92ca168..2d92ca168 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationType.java
index 38c1dcda7..38c1dcda7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleNameType.java
index ddd55f71d..ddd55f71d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleType.java
index 9dcc8f976..9dcc8f976 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EjbRelationshipRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnterpriseBeansType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnterpriseBeansType.java
index c1250099b..c1250099b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnterpriseBeansType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnterpriseBeansType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EntityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EntityType.java
index a04d0067b..a04d0067b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EntityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EntityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryNameType.java
index 2035ba2bc..2035ba2bc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryType.java
index 7cd27d757..7cd27d757 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryTypeType.java
index 6ee37d492..6ee37d492 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryValueType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryValueType.java
index b0df903bd..b0df903bd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryValueType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/EnvEntryValueType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ExcludeListType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ExcludeListType.java
index 85fb66349..85fb66349 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ExcludeListType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ExcludeListType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/FieldNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/FieldNameType.java
index a21756e8c..a21756e8c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/FieldNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/FieldNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/HomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/HomeType.java
index a62ebf690..a62ebf690 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/HomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/HomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/LargeIconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/LargeIconType.java
index 98f726785..98f726785 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/LargeIconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/LargeIconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalHomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalHomeType.java
index fb4659071..fb4659071 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalType.java
index f29e3ffa0..f29e3ffa0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/LocalType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenDestinationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenDestinationType.java
index 50f92bc08..50f92bc08 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenDestinationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenDestinationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenType.java
index f97b71c54..f97b71c54 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageDrivenType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageSelectorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageSelectorType.java
index 1d8a2cdd2..1d8a2cdd2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageSelectorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MessageSelectorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodIntfType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodIntfType.java
index ca58da03f..ca58da03f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodIntfType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodIntfType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodNameType.java
index 28fd53f33..28fd53f33 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamType.java
index 890f6371b..890f6371b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamsType.java
index 66a701eef..66a701eef 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodParamsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodPermissionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodPermissionType.java
index 7ef849867..7ef849867 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodPermissionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodPermissionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodType.java
index 007c29eae..007c29eae 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MultiplicityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MultiplicityType.java
index 19ec320e9..19ec320e9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/MultiplicityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/MultiplicityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/PersistenceTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/PersistenceTypeType.java
index bc0c28e6c..bc0c28e6c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/PersistenceTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/PersistenceTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimKeyClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimKeyClassType.java
index ff0c6bb9b..ff0c6bb9b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimKeyClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimKeyClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimkeyFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimkeyFieldType.java
index a474218f3..a474218f3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimkeyFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/PrimkeyFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryMethodType.java
index c1821a6c9..c1821a6c9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryType.java
index 6531b2652..6531b2652 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/QueryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ReentrantType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ReentrantType.java
index 1b720f95d..1b720f95d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ReentrantType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ReentrantType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipRoleSourceType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipRoleSourceType.java
index 66a209fff..66a209fff 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipRoleSourceType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipRoleSourceType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipsType.java
index 9cc6ac217..9cc6ac217 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RelationshipsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RemoteType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RemoteType.java
index ce2581ab7..ce2581ab7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RemoteType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RemoteType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResAuthType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResAuthType.java
index 9d1c6068b..9d1c6068b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResAuthType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResRefNameType.java
index 9d33b560d..9d33b560d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResSharingScopeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResSharingScopeType.java
index bd0502aeb..bd0502aeb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResTypeType.java
index c1509b81f..c1509b81f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefNameType.java
index 9de15fc86..9de15fc86 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefType.java
index 071ea3f33..071ea3f33 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefTypeType.java
index c994f5959..c994f5959 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceEnvRefTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceRefType.java
index 64416f596..64416f596 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResultTypeMappingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResultTypeMappingType.java
index fd74a9879..fd74a9879 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResultTypeMappingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/ResultTypeMappingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleLinkType.java
index 0758f22f4..0758f22f4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleNameType.java
index 06a40fd29..06a40fd29 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RunAsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RunAsType.java
index df3ed0931..df3ed0931 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/RunAsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/RunAsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityIdentityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityIdentityType.java
index 31327aa76..31327aa76 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityIdentityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityIdentityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleRefType.java
index ebeb70eb9..ebeb70eb9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleType.java
index 8797e65a3..8797e65a3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionType.java
index 075d39f61..075d39f61 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionTypeType.java
index 679d6d182..679d6d182 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SessionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SmallIconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SmallIconType.java
index 2eebec3c5..2eebec3c5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SmallIconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SmallIconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SubscriptionDurabilityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SubscriptionDurabilityType.java
index e1f07dbd5..e1f07dbd5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/SubscriptionDurabilityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/SubscriptionDurabilityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransAttributeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransAttributeType.java
index f2c5eb11d..f2c5eb11d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransAttributeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransAttributeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransactionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransactionTypeType.java
index c56ad7b47..c56ad7b47 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransactionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/TransactionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/UncheckedType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/UncheckedType.java
index 954d1f45a..954d1f45a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/UncheckedType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/UncheckedType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/UseCallerIdentityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/UseCallerIdentityType.java
index 0bfaa3be4..0bfaa3be4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/UseCallerIdentityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/UseCallerIdentityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AbstractSchemaNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AbstractSchemaNameTypeImpl.java
index cec72e39a..cec72e39a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AbstractSchemaNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AbstractSchemaNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AcknowledgeModeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AcknowledgeModeTypeImpl.java
index c18da3f71..c18da3f71 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AcknowledgeModeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AcknowledgeModeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AssemblyDescriptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AssemblyDescriptorTypeImpl.java
index 314ea1ba4..314ea1ba4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AssemblyDescriptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/AssemblyDescriptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CascadeDeleteTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CascadeDeleteTypeImpl.java
index f3a065099..f3a065099 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CascadeDeleteTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CascadeDeleteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpFieldTypeImpl.java
index eb879c90e..eb879c90e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpVersionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpVersionTypeImpl.java
index fbf5bda44..fbf5bda44 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpVersionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmpVersionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldNameTypeImpl.java
index 5f6e70d24..5f6e70d24 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeImpl.java
index a2de371a6..a2de371a6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeTypeImpl.java
index f5a7e689d..f5a7e689d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/CmrFieldTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ContainerTransactionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ContainerTransactionTypeImpl.java
index d9e4f3649..d9e4f3649 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ContainerTransactionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ContainerTransactionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DescriptionTypeImpl.java
index dc2105682..dc2105682 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DestinationTypeTypeImpl.java
index 145457723..145457723 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DisplayNameTypeImpl.java
index 2466ab40b..2466ab40b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DocumentRootImpl.java
index 57c83e2f7..57c83e2f7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClassTypeImpl.java
index 3e1717bd2..3e1717bd2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClientJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClientJarTypeImpl.java
index f0308c574..f0308c574 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClientJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbClientJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20FactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20FactoryImpl.java
index 80cb6c61c..80cb6c61c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20FactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20PackageImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20PackageImpl.java
index 4c207ea0c..4c207ea0c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20PackageImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJar20PackageImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJarTypeImpl.java
index 5cbc90412..5cbc90412 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLinkTypeImpl.java
index e0142e6b7..e0142e6b7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLocalRefTypeImpl.java
index 98afd702b..98afd702b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbNameTypeImpl.java
index 7e4bf16d0..7e4bf16d0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbQlTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbQlTypeImpl.java
index fc3859398..fc3859398 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbQlTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbQlTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefNameTypeImpl.java
index d9182ddf4..d9182ddf4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeImpl.java
index b5ca55a25..b5ca55a25 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeTypeImpl.java
index 16b779676..16b779676 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationNameTypeImpl.java
index d00726769..d00726769 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationTypeImpl.java
index fa2febfea..fa2febfea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleNameTypeImpl.java
index bf31151c7..bf31151c7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleTypeImpl.java
index 013ad9f34..013ad9f34 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EjbRelationshipRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnterpriseBeansTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnterpriseBeansTypeImpl.java
index 4249fcfc2..4249fcfc2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnterpriseBeansTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnterpriseBeansTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EntityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EntityTypeImpl.java
index 4f4d87f04..4f4d87f04 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EntityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EntityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryNameTypeImpl.java
index 4c079ec90..4c079ec90 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeImpl.java
index 77866646d..77866646d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeTypeImpl.java
index 0bf9ee9ea..0bf9ee9ea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryValueTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryValueTypeImpl.java
index cc3484cdd..cc3484cdd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/EnvEntryValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ExcludeListTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ExcludeListTypeImpl.java
index 4cf0804e3..4cf0804e3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ExcludeListTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ExcludeListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/FieldNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/FieldNameTypeImpl.java
index 6331416a4..6331416a4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/FieldNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/FieldNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/HomeTypeImpl.java
index 442081a0e..442081a0e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LargeIconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LargeIconTypeImpl.java
index e7d7bbc8b..e7d7bbc8b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LargeIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LargeIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalHomeTypeImpl.java
index 8cc48c981..8cc48c981 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalTypeImpl.java
index 20e60cbbc..20e60cbbc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenDestinationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenDestinationTypeImpl.java
index 3e02d44a4..3e02d44a4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenTypeImpl.java
index 83bc467e1..83bc467e1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageDrivenTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageSelectorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageSelectorTypeImpl.java
index d01ce2e7e..d01ce2e7e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageSelectorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MessageSelectorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodIntfTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodIntfTypeImpl.java
index a2da6e6a8..a2da6e6a8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodIntfTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodIntfTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodNameTypeImpl.java
index 5be55cf78..5be55cf78 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamTypeImpl.java
index 60147d505..60147d505 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamsTypeImpl.java
index 26f464e2c..26f464e2c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodParamsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodPermissionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodPermissionTypeImpl.java
index 5d5a9ae3d..5d5a9ae3d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodPermissionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodPermissionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodTypeImpl.java
index 3ff39b7c4..3ff39b7c4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MultiplicityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MultiplicityTypeImpl.java
index 78d24e116..78d24e116 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MultiplicityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/MultiplicityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PersistenceTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PersistenceTypeTypeImpl.java
index ef2424128..ef2424128 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PersistenceTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PersistenceTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimKeyClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimKeyClassTypeImpl.java
index a4ad4aa97..a4ad4aa97 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimKeyClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimKeyClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimkeyFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimkeyFieldTypeImpl.java
index 01e5534fb..01e5534fb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimkeyFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/PrimkeyFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryMethodTypeImpl.java
index f07f29e3b..f07f29e3b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryTypeImpl.java
index b812cce2a..b812cce2a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/QueryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ReentrantTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ReentrantTypeImpl.java
index 88c0b039e..88c0b039e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ReentrantTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ReentrantTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipRoleSourceTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipRoleSourceTypeImpl.java
index ea439185b..ea439185b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipRoleSourceTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipRoleSourceTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipsTypeImpl.java
index d5a11e494..d5a11e494 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RelationshipsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RemoteTypeImpl.java
index c45b0ae12..c45b0ae12 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResAuthTypeImpl.java
index fc39827fd..fc39827fd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResRefNameTypeImpl.java
index 437f31861..437f31861 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResSharingScopeTypeImpl.java
index 4ec270c76..4ec270c76 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResTypeTypeImpl.java
index 1b35932c7..1b35932c7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefNameTypeImpl.java
index bcbcc0fc9..bcbcc0fc9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeImpl.java
index 6d27c9d07..6d27c9d07 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeTypeImpl.java
index d20491019..d20491019 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceEnvRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceRefTypeImpl.java
index 1534c8579..1534c8579 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResultTypeMappingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResultTypeMappingTypeImpl.java
index 8ee9a40d2..8ee9a40d2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResultTypeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/ResultTypeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleLinkTypeImpl.java
index 066fa0354..066fa0354 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleNameTypeImpl.java
index a2292c041..a2292c041 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RunAsTypeImpl.java
index 5d072fb75..5d072fb75 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityIdentityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityIdentityTypeImpl.java
index 4bb30404e..4bb30404e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityIdentityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityIdentityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleRefTypeImpl.java
index 78ab4211b..78ab4211b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleTypeImpl.java
index f2661e054..f2661e054 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeImpl.java
index d69c28612..d69c28612 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeTypeImpl.java
index 4c04a438e..4c04a438e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SessionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SmallIconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SmallIconTypeImpl.java
index 033b07df7..033b07df7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SmallIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SmallIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SubscriptionDurabilityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SubscriptionDurabilityTypeImpl.java
index 63d38779a..63d38779a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SubscriptionDurabilityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/SubscriptionDurabilityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransAttributeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransAttributeTypeImpl.java
index 1143e30e6..1143e30e6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransAttributeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransAttributeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransactionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransactionTypeTypeImpl.java
index d47375f9b..d47375f9b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransactionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/TransactionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UncheckedTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UncheckedTypeImpl.java
index 711102bcb..711102bcb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UncheckedTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UncheckedTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UseCallerIdentityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UseCallerIdentityTypeImpl.java
index ed0c36ad7..ed0c36ad7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UseCallerIdentityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/impl/UseCallerIdentityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20AdapterFactory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20AdapterFactory.java
index 53b721d25..53b721d25 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20AdapterFactory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceFactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceFactoryImpl.java
index f15579dd3..f15579dd3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceImpl.java
index f3cbda37d..f3cbda37d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20Switch.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20Switch.java
index 9bbc8a881..9bbc8a881 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20Switch.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20Switch.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20XMLProcessor.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20XMLProcessor.java
index 76353dd55..76353dd55 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20XMLProcessor.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar20/util/EjbJar20XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigPropertyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigPropertyType.java
index 2b1447544..2b1447544 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigPropertyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigPropertyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigType.java
index a175c42c7..a175c42c7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ActivationConfigType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/AssemblyDescriptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/AssemblyDescriptorType.java
index 0811c497c..0811c497c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/AssemblyDescriptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/AssemblyDescriptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpFieldType.java
index 6769adb80..6769adb80 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionType.java
index 0c8894f8e..0c8894f8e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionTypeBase.java
index b060f645a..b060f645a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmpVersionTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldType.java
index 898434657..898434657 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeType.java
index 4c7ccab98..4c7ccab98 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeTypeBase.java
index 97cf120ff..97cf120ff 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/CmrFieldTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ContainerTransactionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ContainerTransactionType.java
index 60f25c892..60f25c892 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ContainerTransactionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ContainerTransactionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/DescriptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/DescriptionType.java
index 5746097a2..5746097a2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/DescriptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/DisplayNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/DisplayNameType.java
index 6ab7baad2..6ab7baad2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/DocumentRoot.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/DocumentRoot.java
index b11dc2c4d..b11dc2c4d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbClassType.java
index 8024b66ac..8024b66ac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Factory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Factory.java
index c275fe9e6..c275fe9e6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Factory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Factory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Package.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Package.java
index c22206e35..c22206e35 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Package.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJar21Package.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJarType.java
index 349b14d34..349b14d34 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLinkType.java
index da84c6d82..da84c6d82 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLocalRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLocalRefType.java
index 0caca0045..0caca0045 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbNameType.java
index a78e8ba08..a78e8ba08 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefNameType.java
index 7fd6a653f..7fd6a653f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefType.java
index 85da97948..85da97948 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeType.java
index 154d25c4d..154d25c4d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeTypeBase.java
index e8e056f0b..e8e056f0b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRefTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationType.java
index 21903d7c8..21903d7c8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationshipRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationshipRoleType.java
index 49a50549a..49a50549a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationshipRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EjbRelationshipRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EmptyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EmptyType.java
index 2302e3132..2302e3132 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EmptyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EmptyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnterpriseBeansType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnterpriseBeansType.java
index 441594af6..441594af6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnterpriseBeansType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnterpriseBeansType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EntityBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EntityBeanType.java
index 18e01e209..18e01e209 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EntityBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EntityBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryType.java
index a5b88a88f..a5b88a88f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesType.java
index 606cbc2d1..606cbc2d1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesTypeBase.java
index b90e48e3b..b90e48e3b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/EnvEntryTypeValuesTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ExcludeListType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ExcludeListType.java
index 8f9df765c..8f9df765c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ExcludeListType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ExcludeListType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/FullyQualifiedClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/FullyQualifiedClassType.java
index 3e5c15a4e..3e5c15a4e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/FullyQualifiedClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/FullyQualifiedClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanType.java
index 87ab76759..87ab76759 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanTypeBase.java
index 1496e4fb7..1496e4fb7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/GenericBooleanTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/HomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/HomeType.java
index f6f4315b9..f6f4315b9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/HomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/HomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/IconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/IconType.java
index 88de2f15a..88de2f15a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/IconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/IconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaIdentifierType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaIdentifierType.java
index 16b17eeab..16b17eeab 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaIdentifierType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaIdentifierType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaTypeType.java
index f9a5b3599..f9a5b3599 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/JavaTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/JndiNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/JndiNameType.java
index 7a690924d..7a690924d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/JndiNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/JndiNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ListenerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ListenerType.java
index f4967d5ef..f4967d5ef 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ListenerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ListenerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalHomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalHomeType.java
index 81d918333..81d918333 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalType.java
index 8bdf8dd49..8bdf8dd49 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/LocalType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationLinkType.java
index 9cb05968a..9cb05968a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationRefType.java
index 034524f10..034524f10 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationType.java
index ede6a56da..ede6a56da 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationTypeType.java
index e08b1320e..e08b1320e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageType.java
index 734220f39..734220f39 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageTypeBase.java
index 269c24f5d..269c24f5d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDestinationUsageTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDrivenBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDrivenBeanType.java
index 90e22649f..90e22649f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDrivenBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MessageDrivenBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfType.java
index 5512181cf..5512181cf 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfTypeBase.java
index ae695bb97..ae695bb97 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodIntfTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodNameType.java
index 716fcedb9..716fcedb9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodParamsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodParamsType.java
index f67ef50f2..f67ef50f2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodParamsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodParamsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodPermissionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodPermissionType.java
index ab013f7b6..ab013f7b6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodPermissionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodPermissionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodType.java
index 6d0c71baa..6d0c71baa 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityType.java
index 15737db5e..15737db5e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityTypeBase.java
index eed5cc488..eed5cc488 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/MultiplicityTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ParamValueType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ParamValueType.java
index 8c7aa6695..8c7aa6695 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ParamValueType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PathType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PathType.java
index 71bbc5449..71bbc5449 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PathType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PathType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeType.java
index f0d526d12..f0d526d12 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeTypeBase.java
index fa97f75d7..fa97f75d7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PersistenceTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PortComponentRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PortComponentRefType.java
index ae4ec0cd4..ae4ec0cd4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/PortComponentRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/PortComponentRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryMethodType.java
index c1d7b735c..c1d7b735c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryType.java
index 83a8b7e6e..83a8b7e6e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/QueryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipRoleSourceType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipRoleSourceType.java
index 5cb98236f..5cb98236f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipRoleSourceType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipRoleSourceType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipsType.java
index 01b09c639..01b09c639 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RelationshipsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RemoteType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RemoteType.java
index f9a00f72e..f9a00f72e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RemoteType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RemoteType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthType.java
index 21b1ee423..21b1ee423 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthTypeBase.java
index ed97ac063..ed97ac063 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResAuthTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeType.java
index d0c694b76..d0c694b76 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeTypeBase.java
index f12c82600..f12c82600 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResSharingScopeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceEnvRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceEnvRefType.java
index 7dceb0561..7dceb0561 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceRefType.java
index 11c3f88e9..11c3f88e9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingType.java
index ec25c01a7..ec25c01a7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingTypeBase.java
index 2c9a19f56..2c9a19f56 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ResultTypeMappingTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RoleNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RoleNameType.java
index e15b8f2b7..e15b8f2b7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RoleNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RunAsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RunAsType.java
index 50c54ca0d..50c54ca0d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/RunAsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/RunAsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityIdentityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityIdentityType.java
index 18d9b6d01..18d9b6d01 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityIdentityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityIdentityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleRefType.java
index 0598f9709..0598f9709 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleType.java
index 3b24e9829..3b24e9829 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefHandlerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefHandlerType.java
index 901077ef7..901077ef7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefHandlerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefHandlerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefType.java
index 1cf8a2574..1cf8a2574 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/ServiceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionBeanType.java
index 2d9d66136..2d9d66136 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeType.java
index 596f08633..596f08633 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeTypeBase.java
index 53b62fe0e..53b62fe0e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/SessionTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/String.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/String.java
index 15a34cb48..15a34cb48 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/String.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/String.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeType.java
index f8822b070..f8822b070 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeTypeBase.java
index d24b13446..d24b13446 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransAttributeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeType.java
index 1a6381b35..1a6381b35 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeTypeBase.java
index 54c90a126..54c90a126 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TransactionTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TrueFalseType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TrueFalseType.java
index 854b301a7..854b301a7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/TrueFalseType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/TrueFalseType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/UrlPatternType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/UrlPatternType.java
index 0687a1bc8..0687a1bc8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdAnyURIType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdAnyURIType.java
index f3e516ca9..f3e516ca9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdAnyURIType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdAnyURIType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdBooleanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdBooleanType.java
index bf632c3ce..bf632c3ce 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdBooleanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdBooleanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdIntegerType.java
index 9413f2848..9413f2848 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNMTOKENType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNMTOKENType.java
index bfee35c7f..bfee35c7f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNMTOKENType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNMTOKENType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNonNegativeIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNonNegativeIntegerType.java
index e883cc1a7..e883cc1a7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNonNegativeIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdNonNegativeIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdPositiveIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdPositiveIntegerType.java
index 362f6b028..362f6b028 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdPositiveIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdPositiveIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdQNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdQNameType.java
index 579867711..579867711 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdQNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdQNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdStringType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdStringType.java
index 83c1099f2..83c1099f2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdStringType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/XsdStringType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigPropertyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigPropertyTypeImpl.java
index b15e47c9d..b15e47c9d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigPropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigPropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigTypeImpl.java
index 41cd44e56..41cd44e56 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ActivationConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/AssemblyDescriptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/AssemblyDescriptorTypeImpl.java
index 014fa22c4..014fa22c4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/AssemblyDescriptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/AssemblyDescriptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpFieldTypeImpl.java
index e9978222a..e9978222a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpVersionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpVersionTypeImpl.java
index 451d652f2..451d652f2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpVersionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmpVersionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeImpl.java
index 36f6c693c..36f6c693c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeTypeImpl.java
index 5264a7932..5264a7932 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/CmrFieldTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ContainerTransactionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ContainerTransactionTypeImpl.java
index 20db1a92d..20db1a92d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ContainerTransactionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ContainerTransactionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DescriptionTypeImpl.java
index cce87d3ad..cce87d3ad 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DisplayNameTypeImpl.java
index 8e38a228b..8e38a228b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DocumentRootImpl.java
index bf5d8b3cc..bf5d8b3cc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbClassTypeImpl.java
index d1dab942b..d1dab942b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21FactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21FactoryImpl.java
index 6d9114af9..6d9114af9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21FactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21PackageImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21PackageImpl.java
index 2022cb9e9..2022cb9e9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21PackageImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJar21PackageImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJarTypeImpl.java
index 89fc0ca35..89fc0ca35 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLinkTypeImpl.java
index 81f10dc3e..81f10dc3e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLocalRefTypeImpl.java
index 19c7d3169..19c7d3169 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbNameTypeImpl.java
index 82a90ef64..82a90ef64 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefNameTypeImpl.java
index a1374c3b8..a1374c3b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeImpl.java
index 68b602e77..68b602e77 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeTypeImpl.java
index 9fa4b9ec2..9fa4b9ec2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationTypeImpl.java
index b81f99755..b81f99755 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationshipRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationshipRoleTypeImpl.java
index 41e6d01de..41e6d01de 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationshipRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EjbRelationshipRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EmptyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EmptyTypeImpl.java
index 657ee64a0..657ee64a0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EmptyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EmptyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnterpriseBeansTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnterpriseBeansTypeImpl.java
index b6339ee1e..b6339ee1e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnterpriseBeansTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnterpriseBeansTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EntityBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EntityBeanTypeImpl.java
index ac46326af..ac46326af 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EntityBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EntityBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeImpl.java
index c1e353ba5..c1e353ba5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeValuesTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeValuesTypeImpl.java
index 83b09d09e..83b09d09e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeValuesTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/EnvEntryTypeValuesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ExcludeListTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ExcludeListTypeImpl.java
index b7926fc51..b7926fc51 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ExcludeListTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ExcludeListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/FullyQualifiedClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/FullyQualifiedClassTypeImpl.java
index bb2907d70..bb2907d70 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/FullyQualifiedClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/FullyQualifiedClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/GenericBooleanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/GenericBooleanTypeImpl.java
index ec0f21be9..ec0f21be9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/GenericBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/GenericBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/HomeTypeImpl.java
index b5e9b09b8..b5e9b09b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/IconTypeImpl.java
index 3d408a35a..3d408a35a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaIdentifierTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaIdentifierTypeImpl.java
index 630eec04e..630eec04e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaIdentifierTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaIdentifierTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaTypeTypeImpl.java
index 86f2c6684..86f2c6684 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JavaTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JndiNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JndiNameTypeImpl.java
index 0e5ef7da3..0e5ef7da3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JndiNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/JndiNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ListenerTypeImpl.java
index 0a3d5a6f0..0a3d5a6f0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalHomeTypeImpl.java
index d02ade648..d02ade648 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalTypeImpl.java
index 930aa15d4..930aa15d4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationLinkTypeImpl.java
index 8c41f3834..8c41f3834 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationRefTypeImpl.java
index d03cdb0a8..d03cdb0a8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeImpl.java
index 6aa4bd0b8..6aa4bd0b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeTypeImpl.java
index db648fb33..db648fb33 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationUsageTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationUsageTypeImpl.java
index 8eab680ac..8eab680ac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationUsageTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDestinationUsageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDrivenBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDrivenBeanTypeImpl.java
index 2993cc4ea..2993cc4ea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDrivenBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MessageDrivenBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodIntfTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodIntfTypeImpl.java
index 96c8c6de3..96c8c6de3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodIntfTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodIntfTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodNameTypeImpl.java
index e47e8d397..e47e8d397 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodParamsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodParamsTypeImpl.java
index 0b209c5e7..0b209c5e7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodParamsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodParamsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodPermissionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodPermissionTypeImpl.java
index dfb20d2a2..dfb20d2a2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodPermissionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodPermissionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodTypeImpl.java
index 7e9d80990..7e9d80990 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MultiplicityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MultiplicityTypeImpl.java
index 06c961477..06c961477 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MultiplicityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/MultiplicityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ParamValueTypeImpl.java
index 481a64c34..481a64c34 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PathTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PathTypeImpl.java
index e6d782f6a..e6d782f6a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PathTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PersistenceTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PersistenceTypeTypeImpl.java
index 335a8d98f..335a8d98f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PersistenceTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PersistenceTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PortComponentRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PortComponentRefTypeImpl.java
index 9ea22eee8..9ea22eee8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PortComponentRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/PortComponentRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryMethodTypeImpl.java
index ea2215c80..ea2215c80 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryTypeImpl.java
index 502e43534..502e43534 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/QueryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipRoleSourceTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipRoleSourceTypeImpl.java
index bcd2c15ed..bcd2c15ed 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipRoleSourceTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipRoleSourceTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipsTypeImpl.java
index b9404c884..b9404c884 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RelationshipsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RemoteTypeImpl.java
index 62c1166a3..62c1166a3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResAuthTypeImpl.java
index dcbe1ce98..dcbe1ce98 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResSharingScopeTypeImpl.java
index b08cbf292..b08cbf292 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceEnvRefTypeImpl.java
index 172cbfef3..172cbfef3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceRefTypeImpl.java
index 2f702efb5..2f702efb5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResultTypeMappingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResultTypeMappingTypeImpl.java
index a15a588bd..a15a588bd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResultTypeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ResultTypeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RoleNameTypeImpl.java
index 082928e24..082928e24 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RunAsTypeImpl.java
index 74cf351b8..74cf351b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityIdentityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityIdentityTypeImpl.java
index da07eac04..da07eac04 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityIdentityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityIdentityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleRefTypeImpl.java
index e76f16220..e76f16220 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleTypeImpl.java
index 28e80070c..28e80070c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefHandlerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefHandlerTypeImpl.java
index 552d6f5bf..552d6f5bf 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefHandlerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefHandlerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefTypeImpl.java
index b4872bca0..b4872bca0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/ServiceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionBeanTypeImpl.java
index 27190aec7..27190aec7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionTypeTypeImpl.java
index fc3c5ed40..fc3c5ed40 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/SessionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/StringImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/StringImpl.java
index 5dd03b572..5dd03b572 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/StringImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/StringImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransAttributeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransAttributeTypeImpl.java
index 7eb60d4ba..7eb60d4ba 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransAttributeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransAttributeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransactionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransactionTypeTypeImpl.java
index 3dfe293b9..3dfe293b9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransactionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TransactionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TrueFalseTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TrueFalseTypeImpl.java
index 6b59eb5c3..6b59eb5c3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TrueFalseTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/TrueFalseTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/UrlPatternTypeImpl.java
index eefb45222..eefb45222 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdAnyURITypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdAnyURITypeImpl.java
index 6083aa303..6083aa303 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdAnyURITypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdAnyURITypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdBooleanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdBooleanTypeImpl.java
index a3a31333f..a3a31333f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdIntegerTypeImpl.java
index 6a0d67187..6a0d67187 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNMTOKENTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNMTOKENTypeImpl.java
index 1d7f4ed26..1d7f4ed26 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNMTOKENTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNMTOKENTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNonNegativeIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNonNegativeIntegerTypeImpl.java
index 9ccd2adab..9ccd2adab 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNonNegativeIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdNonNegativeIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdPositiveIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdPositiveIntegerTypeImpl.java
index 3cfcf18ab..3cfcf18ab 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdPositiveIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdPositiveIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdQNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdQNameTypeImpl.java
index 9d52949a6..9d52949a6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdQNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdQNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdStringTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdStringTypeImpl.java
index bcbcbeee8..bcbcbeee8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/impl/XsdStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21AdapterFactory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21AdapterFactory.java
index 901425d9b..901425d9b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21AdapterFactory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceFactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceFactoryImpl.java
index 73ea5de92..73ea5de92 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceImpl.java
index bfa85bfd1..bfa85bfd1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Switch.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Switch.java
index 5c4694459..5c4694459 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Switch.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Switch.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Validator.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Validator.java
index e5ec891e0..e5ec891e0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Validator.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21Validator.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21XMLProcessor.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21XMLProcessor.java
index b866dbca2..b866dbca2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21XMLProcessor.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar21/util/EjbJar21XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigPropertyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigPropertyType.java
index a171d5069..a171d5069 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigPropertyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigPropertyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigType.java
index be7fae7c1..be7fae7c1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ActivationConfigType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ApplicationExceptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ApplicationExceptionType.java
index 0c21d53cd..0c21d53cd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ApplicationExceptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ApplicationExceptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/AroundInvokeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/AroundInvokeType.java
index b1fa4180d..b1fa4180d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/AroundInvokeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/AroundInvokeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/AssemblyDescriptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/AssemblyDescriptorType.java
index c50b548c4..c50b548c4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/AssemblyDescriptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/AssemblyDescriptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpFieldType.java
index c9dfa2b40..c9dfa2b40 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionType.java
index 74d6119d5..74d6119d5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionTypeBase.java
index 4f58ae142..4f58ae142 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmpVersionTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldType.java
index 40769e15a..40769e15a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeType.java
index 0840d64b9..0840d64b9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeTypeBase.java
index cf131d02a..cf131d02a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/CmrFieldTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ContainerTransactionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ContainerTransactionType.java
index dd90ae034..dd90ae034 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ContainerTransactionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ContainerTransactionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/DescriptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/DescriptionType.java
index 7f6cfce5b..7f6cfce5b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/DescriptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/DisplayNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/DisplayNameType.java
index ea9ec2e91..ea9ec2e91 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/DocumentRoot.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/DocumentRoot.java
index 394e570c8..394e570c8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbClassType.java
index 5075beb61..5075beb61 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Factory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Factory.java
index e8a2142b4..e8a2142b4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Factory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Factory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Package.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Package.java
index 8444247c7..8444247c7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Package.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJar30Package.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJarType.java
index bff8d7d4f..bff8d7d4f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLinkType.java
index 848c9e1ff..848c9e1ff 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLocalRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLocalRefType.java
index 0b7ee8ccd..0b7ee8ccd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbNameType.java
index 73435b275..73435b275 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefNameType.java
index 5df1440de..5df1440de 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefType.java
index 070745bec..070745bec 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeType.java
index 93f272af6..93f272af6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeTypeBase.java
index a08027756..a08027756 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRefTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationType.java
index 806108d95..806108d95 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationshipRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationshipRoleType.java
index 62c16cb5e..62c16cb5e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationshipRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EjbRelationshipRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EmptyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EmptyType.java
index 6faa89f8c..6faa89f8c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EmptyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EmptyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnterpriseBeansType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnterpriseBeansType.java
index 9158a275e..9158a275e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnterpriseBeansType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnterpriseBeansType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EntityBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EntityBeanType.java
index aa2c49ed4..aa2c49ed4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EntityBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EntityBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryType.java
index beeb53733..beeb53733 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesType.java
index 12bbf8a5b..12bbf8a5b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesTypeBase.java
index 4cddd916f..4cddd916f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/EnvEntryTypeValuesTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ExcludeListType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ExcludeListType.java
index 447659c19..447659c19 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ExcludeListType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ExcludeListType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/FullyQualifiedClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/FullyQualifiedClassType.java
index 0d658fea1..0d658fea1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/FullyQualifiedClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/FullyQualifiedClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanType.java
index 3dbe39038..3dbe39038 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanTypeBase.java
index 3ef0e6fa4..3ef0e6fa4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/GenericBooleanTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/HomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/HomeType.java
index adbe81bb4..adbe81bb4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/HomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/HomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/IconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/IconType.java
index 5f283d7cc..5f283d7cc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/IconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/IconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InitMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InitMethodType.java
index f85aa8dad..f85aa8dad 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InitMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InitMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InjectionTargetType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InjectionTargetType.java
index 41fb836ce..41fb836ce 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InjectionTargetType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InjectionTargetType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorBindingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorBindingType.java
index c02d45fbc..c02d45fbc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorBindingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorBindingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorOrderType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorOrderType.java
index 3ffd22cdc..3ffd22cdc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorOrderType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorOrderType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorType.java
index ac71f8b35..ac71f8b35 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorsType.java
index cc4954a7d..cc4954a7d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/InterceptorsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaIdentifierType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaIdentifierType.java
index 6b2dc179e..6b2dc179e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaIdentifierType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaIdentifierType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaTypeType.java
index 492a5d722..492a5d722 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/JavaTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/JndiNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/JndiNameType.java
index 0ab104ad2..0ab104ad2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/JndiNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/JndiNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/LifecycleCallbackType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/LifecycleCallbackType.java
index 3efecf7eb..3efecf7eb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/LifecycleCallbackType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/LifecycleCallbackType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ListenerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ListenerType.java
index d172f36af..d172f36af 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ListenerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ListenerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalHomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalHomeType.java
index c36470d5b..c36470d5b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalType.java
index 54613d69f..54613d69f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/LocalType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationLinkType.java
index 0124b170a..0124b170a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationRefType.java
index 0305ee5d4..0305ee5d4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationType.java
index 3c3c83d44..3c3c83d44 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationTypeType.java
index 691592e29..691592e29 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageType.java
index 9749d7f99..9749d7f99 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageTypeBase.java
index 1e5f53bf1..1e5f53bf1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDestinationUsageTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDrivenBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDrivenBeanType.java
index d0d44f62d..d0d44f62d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDrivenBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MessageDrivenBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfType.java
index f46e07c2e..f46e07c2e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfTypeBase.java
index e27db303b..e27db303b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodIntfTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodNameType.java
index 31cc63d42..31cc63d42 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodParamsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodParamsType.java
index 7afe8898b..7afe8898b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodParamsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodParamsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodPermissionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodPermissionType.java
index 43f787d5c..43f787d5c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodPermissionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodPermissionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodType.java
index 2ce80cf72..2ce80cf72 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityType.java
index 51b232d0f..51b232d0f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityTypeBase.java
index cde40846c..cde40846c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/MultiplicityTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/NamedMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/NamedMethodType.java
index d679a1d16..d679a1d16 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/NamedMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/NamedMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ParamValueType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ParamValueType.java
index 308a920ea..308a920ea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ParamValueType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PathType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PathType.java
index 8958173f7..8958173f7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PathType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PathType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextRefType.java
index c0c691778..c0c691778 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeType.java
index f30467bea..f30467bea 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeTypeBase.java
index d5e7d07fd..d5e7d07fd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceContextTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeType.java
index 42219e98b..42219e98b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeTypeBase.java
index 8012e98fb..8012e98fb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceUnitRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceUnitRefType.java
index c405a63ba..c405a63ba 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceUnitRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PersistenceUnitRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PortComponentRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PortComponentRefType.java
index 86fa0903d..86fa0903d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PortComponentRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PortComponentRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PropertyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PropertyType.java
index 156f33cc3..156f33cc3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/PropertyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/PropertyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryMethodType.java
index c33e618f9..c33e618f9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryType.java
index fb9c3fb65..fb9c3fb65 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/QueryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipRoleSourceType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipRoleSourceType.java
index bf9e380fc..bf9e380fc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipRoleSourceType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipRoleSourceType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipsType.java
index 250617d46..250617d46 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RelationshipsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoteType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoteType.java
index c2e23c617..c2e23c617 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoteType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoteType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoveMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoveMethodType.java
index 900f0e018..900f0e018 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoveMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RemoveMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthType.java
index 526cef9b6..526cef9b6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthTypeBase.java
index 9cf50e17f..9cf50e17f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResAuthTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeType.java
index 684f6c5f6..684f6c5f6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeTypeBase.java
index 0bb8d41b2..0bb8d41b2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResSharingScopeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceEnvRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceEnvRefType.java
index fa44855c2..fa44855c2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceRefType.java
index d23126075..d23126075 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingType.java
index 0a14fe187..0a14fe187 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingTypeBase.java
index 07a9eb5ef..07a9eb5ef 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ResultTypeMappingTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RoleNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RoleNameType.java
index d197846a3..d197846a3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RoleNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RunAsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RunAsType.java
index 66afd9f48..66afd9f48 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/RunAsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/RunAsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityIdentityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityIdentityType.java
index 1ed2d779d..1ed2d779d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityIdentityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityIdentityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleRefType.java
index 4f0396dba..4f0396dba 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleType.java
index d2e113f14..d2e113f14 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainType.java
index f5dc97b91..f5dc97b91 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainsType.java
index 9ae1f667b..9ae1f667b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerChainsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerType.java
index c0c304d75..c0c304d75 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefHandlerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefType.java
index 3797f9998..3797f9998 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/ServiceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionBeanType.java
index 3a6b3ac0f..3a6b3ac0f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeType.java
index 79a1e2d68..79a1e2d68 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeTypeBase.java
index 916d936e2..916d936e2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/SessionTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/String.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/String.java
index d147b7cff..d147b7cff 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/String.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/String.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeType.java
index 1d6d35e3a..1d6d35e3a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeTypeBase.java
index 85d1a9c63..85d1a9c63 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransAttributeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeType.java
index 1bf40858c..1bf40858c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeTypeBase.java
index 24cd40258..24cd40258 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TransactionTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TrueFalseType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TrueFalseType.java
index e8a25729f..e8a25729f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/TrueFalseType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/TrueFalseType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/UrlPatternType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/UrlPatternType.java
index 7370d34f3..7370d34f3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdAnyURIType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdAnyURIType.java
index 8ea69acb6..8ea69acb6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdAnyURIType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdAnyURIType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdBooleanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdBooleanType.java
index eb4ef0072..eb4ef0072 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdBooleanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdBooleanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdIntegerType.java
index 3b00c6af3..3b00c6af3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNMTOKENType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNMTOKENType.java
index 7ac2c9f1e..7ac2c9f1e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNMTOKENType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNMTOKENType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNonNegativeIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNonNegativeIntegerType.java
index a21bdbb90..a21bdbb90 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNonNegativeIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdNonNegativeIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdPositiveIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdPositiveIntegerType.java
index 78db3c477..78db3c477 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdPositiveIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdPositiveIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdQNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdQNameType.java
index 93cd84bf4..93cd84bf4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdQNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdQNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdStringType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdStringType.java
index 4ad8aaf23..4ad8aaf23 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdStringType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/XsdStringType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigPropertyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigPropertyTypeImpl.java
index 10bbf8574..10bbf8574 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigPropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigPropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigTypeImpl.java
index b6bd7f995..b6bd7f995 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ActivationConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ApplicationExceptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ApplicationExceptionTypeImpl.java
index 5e6d387ed..5e6d387ed 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ApplicationExceptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ApplicationExceptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AroundInvokeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AroundInvokeTypeImpl.java
index 222f997bb..222f997bb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AroundInvokeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AroundInvokeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AssemblyDescriptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AssemblyDescriptorTypeImpl.java
index dc82d5836..dc82d5836 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AssemblyDescriptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/AssemblyDescriptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpFieldTypeImpl.java
index 55a32937d..55a32937d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpVersionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpVersionTypeImpl.java
index 28f58f57e..28f58f57e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpVersionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmpVersionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeImpl.java
index 9806deaac..9806deaac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeTypeImpl.java
index 6042d80d5..6042d80d5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/CmrFieldTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ContainerTransactionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ContainerTransactionTypeImpl.java
index c782a8194..c782a8194 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ContainerTransactionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ContainerTransactionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DescriptionTypeImpl.java
index b468bb18a..b468bb18a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DisplayNameTypeImpl.java
index 511239ba5..511239ba5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DocumentRootImpl.java
index e59e5ee56..e59e5ee56 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbClassTypeImpl.java
index 385c51d84..385c51d84 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30.ecore b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30.ecore
index f0103a62a..f0103a62a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30.ecore
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30.ecore
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30FactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30FactoryImpl.java
index f1bf32801..f1bf32801 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30FactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30PackageImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30PackageImpl.java
index baabeff6c..baabeff6c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30PackageImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJar30PackageImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJarTypeImpl.java
index 858af1eff..858af1eff 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLinkTypeImpl.java
index bc0b7383a..bc0b7383a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLocalRefTypeImpl.java
index a9501ac09..a9501ac09 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbNameTypeImpl.java
index a0963ef19..a0963ef19 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefNameTypeImpl.java
index 805f62ca2..805f62ca2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeImpl.java
index 65de20813..65de20813 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeTypeImpl.java
index f0eec2257..f0eec2257 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationTypeImpl.java
index d84a2f974..d84a2f974 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationshipRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationshipRoleTypeImpl.java
index d43db622c..d43db622c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationshipRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EjbRelationshipRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EmptyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EmptyTypeImpl.java
index c237bf673..c237bf673 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EmptyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EmptyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnterpriseBeansTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnterpriseBeansTypeImpl.java
index cc13f9de9..cc13f9de9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnterpriseBeansTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnterpriseBeansTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EntityBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EntityBeanTypeImpl.java
index bf3400548..bf3400548 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EntityBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EntityBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeImpl.java
index 4a1963ae2..4a1963ae2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeValuesTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeValuesTypeImpl.java
index 7f0e5633a..7f0e5633a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeValuesTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/EnvEntryTypeValuesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ExcludeListTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ExcludeListTypeImpl.java
index ff536364a..ff536364a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ExcludeListTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ExcludeListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/FullyQualifiedClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/FullyQualifiedClassTypeImpl.java
index 8d6a5b872..8d6a5b872 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/FullyQualifiedClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/FullyQualifiedClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/GenericBooleanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/GenericBooleanTypeImpl.java
index 93452e0a4..93452e0a4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/GenericBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/GenericBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/HomeTypeImpl.java
index a17b6ebb1..a17b6ebb1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/IconTypeImpl.java
index e223dc9c0..e223dc9c0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InitMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InitMethodTypeImpl.java
index acb2b1f6f..acb2b1f6f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InitMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InitMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InjectionTargetTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InjectionTargetTypeImpl.java
index 8fe2a29d2..8fe2a29d2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InjectionTargetTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InjectionTargetTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorBindingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorBindingTypeImpl.java
index 3a4988b57..3a4988b57 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorBindingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorBindingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorOrderTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorOrderTypeImpl.java
index 2427d4947..2427d4947 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorOrderTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorOrderTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorTypeImpl.java
index e2dcfafb1..e2dcfafb1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorsTypeImpl.java
index a63155fe6..a63155fe6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/InterceptorsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaIdentifierTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaIdentifierTypeImpl.java
index 2fa5f8a1a..2fa5f8a1a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaIdentifierTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaIdentifierTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaTypeTypeImpl.java
index dd2414d94..dd2414d94 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JavaTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JndiNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JndiNameTypeImpl.java
index d54566cc4..d54566cc4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JndiNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/JndiNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LifecycleCallbackTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LifecycleCallbackTypeImpl.java
index b667369da..b667369da 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LifecycleCallbackTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LifecycleCallbackTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ListenerTypeImpl.java
index 3d9cd0149..3d9cd0149 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalHomeTypeImpl.java
index b9b8f9ee2..b9b8f9ee2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalTypeImpl.java
index 905c1ff28..905c1ff28 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationLinkTypeImpl.java
index 467870a6d..467870a6d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationRefTypeImpl.java
index fa2b70a93..fa2b70a93 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeImpl.java
index 321b62242..321b62242 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeTypeImpl.java
index 173d05324..173d05324 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationUsageTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationUsageTypeImpl.java
index a196366f1..a196366f1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationUsageTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDestinationUsageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDrivenBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDrivenBeanTypeImpl.java
index d1792c38b..d1792c38b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDrivenBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MessageDrivenBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodIntfTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodIntfTypeImpl.java
index dd4bd5129..dd4bd5129 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodIntfTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodIntfTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodNameTypeImpl.java
index 61df934e5..61df934e5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodParamsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodParamsTypeImpl.java
index 6dafa1a90..6dafa1a90 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodParamsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodParamsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodPermissionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodPermissionTypeImpl.java
index 8ba8670be..8ba8670be 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodPermissionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodPermissionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodTypeImpl.java
index 9baa44b5f..9baa44b5f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MultiplicityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MultiplicityTypeImpl.java
index 5dbfa54b8..5dbfa54b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MultiplicityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/MultiplicityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/NamedMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/NamedMethodTypeImpl.java
index 8e6bef5c6..8e6bef5c6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/NamedMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/NamedMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ParamValueTypeImpl.java
index 8d98ed1b8..8d98ed1b8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PathTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PathTypeImpl.java
index cab7134d1..cab7134d1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PathTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextRefTypeImpl.java
index 633c2a439..633c2a439 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextTypeTypeImpl.java
index c3f9be2bf..c3f9be2bf 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceContextTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceTypeTypeImpl.java
index aab89d9af..aab89d9af 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceUnitRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceUnitRefTypeImpl.java
index 57c29eb6d..57c29eb6d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceUnitRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PersistenceUnitRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PortComponentRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PortComponentRefTypeImpl.java
index e4c3601cd..e4c3601cd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PortComponentRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PortComponentRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PropertyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PropertyTypeImpl.java
index 133f29e28..133f29e28 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/PropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryMethodTypeImpl.java
index 1d6bf0e07..1d6bf0e07 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryTypeImpl.java
index dc6b2fe56..dc6b2fe56 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/QueryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipRoleSourceTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipRoleSourceTypeImpl.java
index 08c489904..08c489904 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipRoleSourceTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipRoleSourceTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipsTypeImpl.java
index b991f085b..b991f085b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RelationshipsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoteTypeImpl.java
index 7b261860d..7b261860d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoveMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoveMethodTypeImpl.java
index b17925864..b17925864 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoveMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RemoveMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResAuthTypeImpl.java
index 822894d91..822894d91 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResSharingScopeTypeImpl.java
index 1c8e417b6..1c8e417b6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceEnvRefTypeImpl.java
index 7a9207dfb..7a9207dfb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceRefTypeImpl.java
index 0098d7b25..0098d7b25 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResultTypeMappingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResultTypeMappingTypeImpl.java
index 5ca542e3e..5ca542e3e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResultTypeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ResultTypeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RoleNameTypeImpl.java
index 352b1a52a..352b1a52a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RunAsTypeImpl.java
index 34b85b5b3..34b85b5b3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityIdentityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityIdentityTypeImpl.java
index f5e2a1f46..f5e2a1f46 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityIdentityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityIdentityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleRefTypeImpl.java
index 76a7b26a2..76a7b26a2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleTypeImpl.java
index bb5184de7..bb5184de7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainTypeImpl.java
index 7b53d6d1d..7b53d6d1d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainsTypeImpl.java
index f422b835d..f422b835d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerChainsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerTypeImpl.java
index b72eeb2e0..b72eeb2e0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefHandlerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefTypeImpl.java
index 88f6d45a1..88f6d45a1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/ServiceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionBeanTypeImpl.java
index a765d51f0..a765d51f0 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionTypeTypeImpl.java
index e2105ace2..e2105ace2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/SessionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/StringImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/StringImpl.java
index 019d9bd6e..019d9bd6e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/StringImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/StringImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransAttributeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransAttributeTypeImpl.java
index 11580212d..11580212d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransAttributeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransAttributeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransactionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransactionTypeTypeImpl.java
index 5c1ed4fbd..5c1ed4fbd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransactionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TransactionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TrueFalseTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TrueFalseTypeImpl.java
index 01ba90dfc..01ba90dfc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TrueFalseTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/TrueFalseTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/UrlPatternTypeImpl.java
index d51c73a46..d51c73a46 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdAnyURITypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdAnyURITypeImpl.java
index e41ee0d8e..e41ee0d8e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdAnyURITypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdAnyURITypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdBooleanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdBooleanTypeImpl.java
index 9f1af32ca..9f1af32ca 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdIntegerTypeImpl.java
index 7a91e7dd7..7a91e7dd7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNMTOKENTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNMTOKENTypeImpl.java
index f5059c99c..f5059c99c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNMTOKENTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNMTOKENTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNonNegativeIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNonNegativeIntegerTypeImpl.java
index f22b6509f..f22b6509f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNonNegativeIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdNonNegativeIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdPositiveIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdPositiveIntegerTypeImpl.java
index c9c6f9b14..c9c6f9b14 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdPositiveIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdPositiveIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdQNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdQNameTypeImpl.java
index 5a3d51801..5a3d51801 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdQNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdQNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdStringTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdStringTypeImpl.java
index edfaaeba8..edfaaeba8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/impl/XsdStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30AdapterFactory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30AdapterFactory.java
index c532710c1..c532710c1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30AdapterFactory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceFactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceFactoryImpl.java
index 066ee4e45..066ee4e45 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceImpl.java
index 36f30f844..36f30f844 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Switch.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Switch.java
index b6bab4fe8..b6bab4fe8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Switch.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Switch.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Validator.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Validator.java
index 02f46e7b1..02f46e7b1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Validator.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30Validator.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30XMLProcessor.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30XMLProcessor.java
index 8a809b7d7..8a809b7d7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30XMLProcessor.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar30/util/EjbJar30XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AccessTimeoutType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AccessTimeoutType.java
index 9b1f6836f..9b1f6836f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AccessTimeoutType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AccessTimeoutType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigPropertyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigPropertyType.java
index 6a649b4f3..6a649b4f3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigPropertyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigPropertyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigType.java
index 4e536e1fc..4e536e1fc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ActivationConfigType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesType.java
index 7e35c7086..7e35c7086 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesTypeBase.java
index cdabc8b81..cdabc8b81 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingResponsesTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingType.java
index 15296c2a7..15296c2a7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AddressingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ApplicationExceptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ApplicationExceptionType.java
index d955d24fa..d955d24fa 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ApplicationExceptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ApplicationExceptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundInvokeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundInvokeType.java
index 90733c8c9..90733c8c9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundInvokeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundInvokeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundTimeoutType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundTimeoutType.java
index f894709f6..f894709f6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundTimeoutType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AroundTimeoutType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AssemblyDescriptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AssemblyDescriptorType.java
index d4e9e7ec1..d4e9e7ec1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AssemblyDescriptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AssemblyDescriptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AsyncMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AsyncMethodType.java
index 6b0acb20a..6b0acb20a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/AsyncMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/AsyncMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpFieldType.java
index d85ffdfe2..d85ffdfe2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionType.java
index aa0255071..aa0255071 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionTypeBase.java
index 5262336f4..5262336f4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmpVersionTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldType.java
index 1b0aec192..1b0aec192 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeType.java
index 599db1bb5..599db1bb5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeTypeBase.java
index 24b3242a3..24b3242a3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/CmrFieldTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeType.java
index 9b21731cb..9b21731cb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeTypeBase.java
index f3c067df9..f3c067df9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrencyManagementTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeType.java
index 84c162f5e..84c162f5e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeTypeBase.java
index 7c57b08fe..7c57b08fe 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentLockTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentMethodType.java
index 735ff7c81..735ff7c81 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ConcurrentMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ContainerTransactionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ContainerTransactionType.java
index 2878f5f48..2878f5f48 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ContainerTransactionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ContainerTransactionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DataSourceType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DataSourceType.java
index 4efa7c595..4efa7c595 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DataSourceType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DataSourceType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DependsOnType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DependsOnType.java
index 36debe9bb..36debe9bb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DependsOnType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DependsOnType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DescriptionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DescriptionType.java
index edeb8a5fc..edeb8a5fc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DescriptionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DisplayNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DisplayNameType.java
index e87ecb06a..e87ecb06a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DocumentRoot.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DocumentRoot.java
index 0c8dc0a0a..0c8dc0a0a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbClassType.java
index 07f7f806b..07f7f806b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Factory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Factory.java
index 8382bd1b7..8382bd1b7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Factory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Factory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Package.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Package.java
index ee5e52267..ee5e52267 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Package.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJar31Package.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJarType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJarType.java
index ab42718dc..ab42718dc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJarType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbJarType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLinkType.java
index a95dc4e34..a95dc4e34 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLocalRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLocalRefType.java
index f49e62e74..f49e62e74 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbNameType.java
index c553f2d7e..c553f2d7e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefNameType.java
index 00c1b4980..00c1b4980 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefType.java
index 0e6c483d9..0e6c483d9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeType.java
index 85678f0a7..85678f0a7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeTypeBase.java
index c6b706f72..c6b706f72 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRefTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationType.java
index 25af0851f..25af0851f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationshipRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationshipRoleType.java
index 9edc8f282..9edc8f282 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationshipRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EjbRelationshipRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EmptyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EmptyType.java
index f71a43068..f71a43068 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EmptyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EmptyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnterpriseBeansType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnterpriseBeansType.java
index 3dab9eceb..3dab9eceb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnterpriseBeansType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnterpriseBeansType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EntityBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EntityBeanType.java
index eedccf45c..eedccf45c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EntityBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EntityBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryType.java
index 06a3b8968..06a3b8968 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryTypeValuesType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryTypeValuesType.java
index f6ba04aef..f6ba04aef 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryTypeValuesType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/EnvEntryTypeValuesType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ExcludeListType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ExcludeListType.java
index eeee7f57f..eeee7f57f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ExcludeListType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ExcludeListType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/FullyQualifiedClassType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/FullyQualifiedClassType.java
index 101b84d62..101b84d62 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/FullyQualifiedClassType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/FullyQualifiedClassType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanType.java
index ffcdbddaf..ffcdbddaf 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanTypeBase.java
index a13abb38d..a13abb38d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/GenericBooleanTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainType.java
index 4bd34c544..4bd34c544 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainsType.java
index eea2a206d..eea2a206d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerChainsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerType.java
index e1b6cccc1..e1b6cccc1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HandlerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HomeType.java
index c45598da2..c45598da2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/HomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/HomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/IconType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/IconType.java
index 2de0d2d7d..2de0d2d7d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/IconType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/IconType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InitMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InitMethodType.java
index 7555453d6..7555453d6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InitMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InitMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InjectionTargetType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InjectionTargetType.java
index e260dd50f..e260dd50f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InjectionTargetType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InjectionTargetType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorBindingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorBindingType.java
index c883be0ec..c883be0ec 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorBindingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorBindingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorOrderType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorOrderType.java
index faab34988..faab34988 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorOrderType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorOrderType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorType.java
index 97ee18a0b..97ee18a0b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorsType.java
index 8b86d979e..8b86d979e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/InterceptorsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/IsolationLevelType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/IsolationLevelType.java
index 240362fca..240362fca 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/IsolationLevelType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/IsolationLevelType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaIdentifierType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaIdentifierType.java
index 0c45ba7c9..0c45ba7c9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaIdentifierType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaIdentifierType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaTypeType.java
index 59c5221c7..59c5221c7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JavaTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JdbcUrlType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JdbcUrlType.java
index 283fc079b..283fc079b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JdbcUrlType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JdbcUrlType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JndiNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JndiNameType.java
index 1aeab0f4b..1aeab0f4b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/JndiNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/JndiNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/LifecycleCallbackType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/LifecycleCallbackType.java
index 6e594cda7..6e594cda7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/LifecycleCallbackType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/LifecycleCallbackType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ListenerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ListenerType.java
index 41f69ff42..41f69ff42 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ListenerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ListenerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalHomeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalHomeType.java
index 40b059208..40b059208 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalType.java
index 0767f9326..0767f9326 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/LocalType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationLinkType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationLinkType.java
index c194765b9..c194765b9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationLinkType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationLinkType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationRefType.java
index fcd6315b3..fcd6315b3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationType.java
index e12de0716..e12de0716 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationTypeType.java
index 8300aea1c..8300aea1c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageType.java
index 02ac7c824..02ac7c824 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageTypeBase.java
index 479d0d2ce..479d0d2ce 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDestinationUsageTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDrivenBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDrivenBeanType.java
index efa8f2afc..efa8f2afc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDrivenBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MessageDrivenBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfType.java
index 58ee92f96..58ee92f96 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfTypeBase.java
index 7adc737b9..7adc737b9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodIntfTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodNameType.java
index d97563cbe..d97563cbe 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodParamsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodParamsType.java
index a08d0441b..a08d0441b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodParamsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodParamsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodPermissionType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodPermissionType.java
index d80c98224..d80c98224 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodPermissionType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodPermissionType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodType.java
index c910f8ade..c910f8ade 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityType.java
index de54432bb..de54432bb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityTypeBase.java
index cbfc5ddec..cbfc5ddec 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/MultiplicityTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/NamedMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/NamedMethodType.java
index 402ae1f01..402ae1f01 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/NamedMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/NamedMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ParamValueType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ParamValueType.java
index e768fad12..e768fad12 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ParamValueType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PathType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PathType.java
index 353a11e8a..353a11e8a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PathType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PathType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextRefType.java
index 93d65817d..93d65817d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeType.java
index a760a9929..a760a9929 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeTypeBase.java
index 038c74329..038c74329 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceContextTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeType.java
index 32d702a3e..32d702a3e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeTypeBase.java
index 1b457a448..1b457a448 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceUnitRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceUnitRefType.java
index 733fc3d6e..733fc3d6e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceUnitRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PersistenceUnitRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PortComponentRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PortComponentRefType.java
index 409c1bd39..409c1bd39 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PortComponentRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PortComponentRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PropertyType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PropertyType.java
index 450e9e5c7..450e9e5c7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/PropertyType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/PropertyType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryMethodType.java
index d3aad062a..d3aad062a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryType.java
index 29ed1d29e..29ed1d29e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/QueryType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipRoleSourceType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipRoleSourceType.java
index f1f4bd154..f1f4bd154 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipRoleSourceType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipRoleSourceType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipsType.java
index 1c0447171..1c0447171 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RelationshipsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoteType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoteType.java
index 1431b788b..1431b788b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoteType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoteType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoveMethodType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoveMethodType.java
index e26334e8f..e26334e8f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoveMethodType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RemoveMethodType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthType.java
index 74fa2b410..74fa2b410 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthTypeBase.java
index dc8278d1d..dc8278d1d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResAuthTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeType.java
index e826d6c70..e826d6c70 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeTypeBase.java
index 3330bc973..3330bc973 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResSharingScopeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceEnvRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceEnvRefType.java
index 1403bffb3..1403bffb3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceRefType.java
index 26bf5f176..26bf5f176 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RespectBindingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RespectBindingType.java
index d6ca4006c..d6ca4006c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RespectBindingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RespectBindingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingType.java
index 7509dec16..7509dec16 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingTypeBase.java
index c93ca84b6..c93ca84b6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ResultTypeMappingTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RoleNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RoleNameType.java
index f505fc185..f505fc185 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RoleNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RunAsType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RunAsType.java
index c134b6efc..c134b6efc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/RunAsType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/RunAsType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityIdentityType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityIdentityType.java
index 33ff82ce7..33ff82ce7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityIdentityType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityIdentityType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleRefType.java
index d20c308d6..d20c308d6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleType.java
index 8fa36164c..8fa36164c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ServiceRefType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ServiceRefType.java
index 2f0455b52..2f0455b52 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/ServiceRefType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/ServiceRefType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionBeanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionBeanType.java
index 26db5964d..26db5964d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionBeanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionBeanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeType.java
index 0743fbce2..0743fbce2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeTypeBase.java
index 7c6d3e136..7c6d3e136 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/SessionTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/StatefulTimeoutType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/StatefulTimeoutType.java
index 03b35b52f..03b35b52f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/StatefulTimeoutType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/StatefulTimeoutType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/String.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/String.java
index 21448e784..21448e784 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/String.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/String.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeType.java
index de0d4c3bd..de0d4c3bd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeTypeBase.java
index c858980ae..c858980ae 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimeUnitTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerScheduleType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerScheduleType.java
index 36039b2a3..36039b2a3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerScheduleType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerScheduleType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerType.java
index 01366b488..01366b488 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TimerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeType.java
index e09e9d8ac..e09e9d8ac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeTypeBase.java
index c757ba6d9..c757ba6d9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransAttributeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeType.java
index ab7c50733..ab7c50733 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeTypeBase.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeTypeBase.java
index b5557a95b..b5557a95b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TransactionTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TrueFalseType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TrueFalseType.java
index c185257c5..c185257c5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/TrueFalseType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/TrueFalseType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/UrlPatternType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/UrlPatternType.java
index 481a9cb5c..481a9cb5c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdAnyURIType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdAnyURIType.java
index 0e3ed1589..0e3ed1589 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdAnyURIType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdAnyURIType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdBooleanType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdBooleanType.java
index afc723efb..afc723efb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdBooleanType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdBooleanType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdIntegerType.java
index 2f7ba23fb..2f7ba23fb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNMTOKENType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNMTOKENType.java
index f1892e55f..f1892e55f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNMTOKENType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNMTOKENType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNonNegativeIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNonNegativeIntegerType.java
index 5139c91f9..5139c91f9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNonNegativeIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdNonNegativeIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdPositiveIntegerType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdPositiveIntegerType.java
index 99104a001..99104a001 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdPositiveIntegerType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdPositiveIntegerType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdQNameType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdQNameType.java
index cf0eca70c..cf0eca70c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdQNameType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdQNameType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdStringType.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdStringType.java
index beeb7db1e..beeb7db1e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdStringType.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/XsdStringType.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AccessTimeoutTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AccessTimeoutTypeImpl.java
index 9a178e77a..9a178e77a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AccessTimeoutTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AccessTimeoutTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigPropertyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigPropertyTypeImpl.java
index 96fcab6d9..96fcab6d9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigPropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigPropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigTypeImpl.java
index 7e9f1bdbc..7e9f1bdbc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ActivationConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingResponsesTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingResponsesTypeImpl.java
index 3bbe77cd9..3bbe77cd9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingResponsesTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingResponsesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingTypeImpl.java
index ff5aa28c8..ff5aa28c8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AddressingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ApplicationExceptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ApplicationExceptionTypeImpl.java
index 03942060e..03942060e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ApplicationExceptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ApplicationExceptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundInvokeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundInvokeTypeImpl.java
index dcee5928d..dcee5928d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundInvokeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundInvokeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundTimeoutTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundTimeoutTypeImpl.java
index d68a97313..d68a97313 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundTimeoutTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AroundTimeoutTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AssemblyDescriptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AssemblyDescriptorTypeImpl.java
index 4d06a0655..4d06a0655 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AssemblyDescriptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AssemblyDescriptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AsyncMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AsyncMethodTypeImpl.java
index 11da40187..11da40187 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AsyncMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/AsyncMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpFieldTypeImpl.java
index 61fc480f2..61fc480f2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpVersionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpVersionTypeImpl.java
index d59cfc8aa..d59cfc8aa 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpVersionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmpVersionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeImpl.java
index 1df8b720b..1df8b720b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeTypeImpl.java
index 472222f35..472222f35 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/CmrFieldTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrencyManagementTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrencyManagementTypeTypeImpl.java
index 5016be246..5016be246 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrencyManagementTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrencyManagementTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentLockTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentLockTypeTypeImpl.java
index ed8502a98..ed8502a98 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentLockTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentLockTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentMethodTypeImpl.java
index 561ab0f2c..561ab0f2c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ConcurrentMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ContainerTransactionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ContainerTransactionTypeImpl.java
index fff1c9c74..fff1c9c74 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ContainerTransactionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ContainerTransactionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DataSourceTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DataSourceTypeImpl.java
index 62867692b..62867692b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DataSourceTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DataSourceTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DependsOnTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DependsOnTypeImpl.java
index 3cfffc910..3cfffc910 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DependsOnTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DependsOnTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DescriptionTypeImpl.java
index 4cd848905..4cd848905 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DisplayNameTypeImpl.java
index 223e18a0d..223e18a0d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DocumentRootImpl.java
index 4ff5a1070..4ff5a1070 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbClassTypeImpl.java
index 702e32681..702e32681 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31.ecore b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31.ecore
index f61a8554c..f61a8554c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31.ecore
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31.ecore
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31FactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31FactoryImpl.java
index e98c7902f..e98c7902f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31FactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31PackageImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31PackageImpl.java
index 7e13dd4c6..7e13dd4c6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31PackageImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJar31PackageImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJarTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJarTypeImpl.java
index af7df3d99..af7df3d99 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJarTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbJarTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLinkTypeImpl.java
index 031dcd004..031dcd004 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLocalRefTypeImpl.java
index 10af54c6e..10af54c6e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbNameTypeImpl.java
index 0462b37e9..0462b37e9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefNameTypeImpl.java
index 4beb07522..4beb07522 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeImpl.java
index 35bce52bd..35bce52bd 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeTypeImpl.java
index b6ab67928..b6ab67928 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationTypeImpl.java
index 013af7f19..013af7f19 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationshipRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationshipRoleTypeImpl.java
index 788a0078e..788a0078e 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationshipRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EjbRelationshipRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EmptyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EmptyTypeImpl.java
index 7bb89acc5..7bb89acc5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EmptyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EmptyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnterpriseBeansTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnterpriseBeansTypeImpl.java
index 5a7e36567..5a7e36567 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnterpriseBeansTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnterpriseBeansTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EntityBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EntityBeanTypeImpl.java
index 57a4a27a5..57a4a27a5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EntityBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EntityBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeImpl.java
index 41dbd1909..41dbd1909 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeValuesTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeValuesTypeImpl.java
index 851a09a45..851a09a45 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeValuesTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/EnvEntryTypeValuesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ExcludeListTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ExcludeListTypeImpl.java
index 682f38ff4..682f38ff4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ExcludeListTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ExcludeListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/FullyQualifiedClassTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/FullyQualifiedClassTypeImpl.java
index e041f6d78..e041f6d78 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/FullyQualifiedClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/FullyQualifiedClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/GenericBooleanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/GenericBooleanTypeImpl.java
index 6046d501a..6046d501a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/GenericBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/GenericBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainTypeImpl.java
index c6bc1f35c..c6bc1f35c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainsTypeImpl.java
index 2a1f1b035..2a1f1b035 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerChainsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerTypeImpl.java
index b37cc7938..b37cc7938 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HandlerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HomeTypeImpl.java
index 586db3dab..586db3dab 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/IconTypeImpl.java
index 7e7a1615a..7e7a1615a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InitMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InitMethodTypeImpl.java
index 259d7dd79..259d7dd79 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InitMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InitMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InjectionTargetTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InjectionTargetTypeImpl.java
index 27bc62fe5..27bc62fe5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InjectionTargetTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InjectionTargetTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorBindingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorBindingTypeImpl.java
index b87e72464..b87e72464 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorBindingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorBindingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorOrderTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorOrderTypeImpl.java
index 16c8baea3..16c8baea3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorOrderTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorOrderTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorTypeImpl.java
index 5d5253503..5d5253503 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorsTypeImpl.java
index f1c53fd65..f1c53fd65 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/InterceptorsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaIdentifierTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaIdentifierTypeImpl.java
index 800e14e37..800e14e37 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaIdentifierTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaIdentifierTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaTypeTypeImpl.java
index ad4922f6b..ad4922f6b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JavaTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JdbcUrlTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JdbcUrlTypeImpl.java
index afc18ce45..afc18ce45 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JdbcUrlTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JdbcUrlTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JndiNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JndiNameTypeImpl.java
index 0edddcead..0edddcead 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JndiNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/JndiNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LifecycleCallbackTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LifecycleCallbackTypeImpl.java
index 4bbc76ae7..4bbc76ae7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LifecycleCallbackTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LifecycleCallbackTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ListenerTypeImpl.java
index 9d769b9b2..9d769b9b2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalHomeTypeImpl.java
index 556fb25b3..556fb25b3 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalTypeImpl.java
index 88c41baf7..88c41baf7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationLinkTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationLinkTypeImpl.java
index c6f9ef868..c6f9ef868 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationRefTypeImpl.java
index a9b1a8dac..a9b1a8dac 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeImpl.java
index 49ac9caaa..49ac9caaa 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeTypeImpl.java
index 81a763bf5..81a763bf5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationUsageTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationUsageTypeImpl.java
index 9461feff1..9461feff1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationUsageTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDestinationUsageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDrivenBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDrivenBeanTypeImpl.java
index 2c267422f..2c267422f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDrivenBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MessageDrivenBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodIntfTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodIntfTypeImpl.java
index cf75dabfb..cf75dabfb 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodIntfTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodIntfTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodNameTypeImpl.java
index eaafae515..eaafae515 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodParamsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodParamsTypeImpl.java
index f1846083c..f1846083c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodParamsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodParamsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodPermissionTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodPermissionTypeImpl.java
index 85e117484..85e117484 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodPermissionTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodPermissionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodTypeImpl.java
index a6aa4fdf9..a6aa4fdf9 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MultiplicityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MultiplicityTypeImpl.java
index 3bb3cf815..3bb3cf815 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MultiplicityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/MultiplicityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/NamedMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/NamedMethodTypeImpl.java
index 1447fb64f..1447fb64f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/NamedMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/NamedMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ParamValueTypeImpl.java
index 61fe025a2..61fe025a2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PathTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PathTypeImpl.java
index c6c8fb57b..c6c8fb57b 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PathTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextRefTypeImpl.java
index ed9f60970..ed9f60970 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextTypeTypeImpl.java
index 5d9f3fc5a..5d9f3fc5a 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceContextTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceTypeTypeImpl.java
index d472156b4..d472156b4 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceUnitRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceUnitRefTypeImpl.java
index 5fdec9c0c..5fdec9c0c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceUnitRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PersistenceUnitRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PortComponentRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PortComponentRefTypeImpl.java
index 8b9cea574..8b9cea574 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PortComponentRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PortComponentRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PropertyTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PropertyTypeImpl.java
index 94d1d27b1..94d1d27b1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/PropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryMethodTypeImpl.java
index 41828b1d7..41828b1d7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryTypeImpl.java
index 14ef4067d..14ef4067d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/QueryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipRoleSourceTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipRoleSourceTypeImpl.java
index a01c00ca5..a01c00ca5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipRoleSourceTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipRoleSourceTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipsTypeImpl.java
index 574f69bd8..574f69bd8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RelationshipsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoteTypeImpl.java
index a8d14421c..a8d14421c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoveMethodTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoveMethodTypeImpl.java
index ecb8bdc4d..ecb8bdc4d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoveMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RemoveMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResAuthTypeImpl.java
index 5ca30bad5..5ca30bad5 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResSharingScopeTypeImpl.java
index 984f18564..984f18564 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceEnvRefTypeImpl.java
index 3b32da2cf..3b32da2cf 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceRefTypeImpl.java
index fcdf1440d..fcdf1440d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RespectBindingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RespectBindingTypeImpl.java
index 1193e6e60..1193e6e60 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RespectBindingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RespectBindingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResultTypeMappingTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResultTypeMappingTypeImpl.java
index 2343ee74f..2343ee74f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResultTypeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ResultTypeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RoleNameTypeImpl.java
index 4b24fa71d..4b24fa71d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RunAsTypeImpl.java
index b0eb3c054..b0eb3c054 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityIdentityTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityIdentityTypeImpl.java
index 58830c323..58830c323 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityIdentityTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityIdentityTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleRefTypeImpl.java
index 9fe984a04..9fe984a04 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleTypeImpl.java
index c8e0a823c..c8e0a823c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ServiceRefTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ServiceRefTypeImpl.java
index a8b4e0bce..a8b4e0bce 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ServiceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/ServiceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionBeanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionBeanTypeImpl.java
index 48d490653..48d490653 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionBeanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionBeanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionTypeTypeImpl.java
index 8583ebc29..8583ebc29 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/SessionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StatefulTimeoutTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StatefulTimeoutTypeImpl.java
index db7fa60be..db7fa60be 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StatefulTimeoutTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StatefulTimeoutTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StringImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StringImpl.java
index 5384bcd06..5384bcd06 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StringImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/StringImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimeUnitTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimeUnitTypeTypeImpl.java
index 92d8960cc..92d8960cc 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimeUnitTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimeUnitTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerScheduleTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerScheduleTypeImpl.java
index e24f2784d..e24f2784d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerScheduleTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerScheduleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerTypeImpl.java
index 0593d1c9d..0593d1c9d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TimerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransAttributeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransAttributeTypeImpl.java
index dd067c881..dd067c881 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransAttributeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransAttributeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransactionTypeTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransactionTypeTypeImpl.java
index e7b5bb3e8..e7b5bb3e8 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransactionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TransactionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TrueFalseTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TrueFalseTypeImpl.java
index 8c76b02ee..8c76b02ee 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TrueFalseTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/TrueFalseTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/UrlPatternTypeImpl.java
index 70253d00f..70253d00f 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdAnyURITypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdAnyURITypeImpl.java
index 3020bed9d..3020bed9d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdAnyURITypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdAnyURITypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdBooleanTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdBooleanTypeImpl.java
index 1c55a242d..1c55a242d 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdIntegerTypeImpl.java
index fede8ebc2..fede8ebc2 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNMTOKENTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNMTOKENTypeImpl.java
index 9a19076b6..9a19076b6 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNMTOKENTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNMTOKENTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNonNegativeIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNonNegativeIntegerTypeImpl.java
index 359246890..359246890 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNonNegativeIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdNonNegativeIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdPositiveIntegerTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdPositiveIntegerTypeImpl.java
index e38f726f7..e38f726f7 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdPositiveIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdPositiveIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdQNameTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdQNameTypeImpl.java
index f0852f3d1..f0852f3d1 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdQNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdQNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdStringTypeImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdStringTypeImpl.java
index 6ce862753..6ce862753 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/impl/XsdStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31AdapterFactory.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31AdapterFactory.java
index 3f9feaf03..3f9feaf03 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31AdapterFactory.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceFactoryImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceFactoryImpl.java
index a5bd5c659..a5bd5c659 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceImpl.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceImpl.java
index 93cf34d16..93cf34d16 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceImpl.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Switch.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Switch.java
index 3afcf3f94..3afcf3f94 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Switch.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Switch.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Validator.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Validator.java
index 650d4fbad..650d4fbad 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Validator.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31Validator.java
diff --git a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31XMLProcessor.java b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31XMLProcessor.java
index bb32fa89c..bb32fa89c 100644
--- a/org.eclipse.modisco.jee.ejbjar/src/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31XMLProcessor.java
+++ b/org.eclipse.modisco.jee.ejbjar/src-gen/org/eclipse/modisco/jee/ejbjar/EjbJar31/util/EjbJar31XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.facet/.checkstyle b/org.eclipse.modisco.jee.facet/.checkstyle
index 76d3f9035..e69aca1c1 100644
--- a/org.eclipse.modisco.jee.facet/.checkstyle
+++ b/org.eclipse.modisco.jee.facet/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.facet/src/org/eclipse/modisco/jee/facet/JEEFacetActivator.java b/org.eclipse.modisco.jee.facet/src/org/eclipse/modisco/jee/facet/JEEFacetActivator.java
index 85bd01d3c..db4231039 100644
--- a/org.eclipse.modisco.jee.facet/src/org/eclipse/modisco/jee/facet/JEEFacetActivator.java
+++ b/org.eclipse.modisco.jee.facet/src/org/eclipse/modisco/jee/facet/JEEFacetActivator.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

@@ -36,7 +36,7 @@ public class JEEFacetActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -49,7 +49,7 @@ public class JEEFacetActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -62,7 +62,7 @@ public class JEEFacetActivator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JEEFacetActivator getDefault() {

diff --git a/org.eclipse.modisco.jee.jsp.browser.customization/.checkstyle b/org.eclipse.modisco.jee.jsp.browser.customization/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.jee.jsp.browser.customization/.checkstyle
+++ b/org.eclipse.modisco.jee.jsp.browser.customization/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.jsp.browser.customization/src/org/eclipse/modisco/jee/jsp/browser/customization/GetName.java b/org.eclipse.modisco.jee.jsp.browser.customization/src/org/eclipse/modisco/jee/jsp/browser/customization/GetName.java
index 494b9b52a..3540beba6 100644
--- a/org.eclipse.modisco.jee.jsp.browser.customization/src/org/eclipse/modisco/jee/jsp/browser/customization/GetName.java
+++ b/org.eclipse.modisco.jee.jsp.browser.customization/src/org/eclipse/modisco/jee/jsp/browser/customization/GetName.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.jsp.browser.customization;
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/.checkstyle b/org.eclipse.modisco.jee.jsp.discoverer.tests/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java
index e44a5b2c6..3519420dd 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - adapted to new discovery framework (Bug 335003)

@@ -36,7 +36,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -49,7 +49,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -62,7 +62,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/AllTestsInUIThread.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/AllTestsInUIThread.java
index b21bda74f..3a6e17600 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/AllTestsInUIThread.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/AllTestsInUIThread.java
@@ -4,7 +4,7 @@
  * 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:

  *		Nicolas Guyomar (Mia-Software) - initial API and implementation

  *		Nicolas Bros (Mia-Software) - adapted to new discovery framework (Bug 335003)

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/TestMemory.java b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/TestMemory.java
index 7c7e33a50..fb6480b0a 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/TestMemory.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/src/org/eclipse/modisco/jee/jsp/discoverer/tests/TestMemory.java
@@ -4,7 +4,7 @@
  * 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:

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - adapted to new discovery framework (Bug 335003)

diff --git a/org.eclipse.modisco.jee.jsp.discoverer.ui/.checkstyle b/org.eclipse.modisco.jee.jsp.discoverer.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.jee.jsp.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.ui/src/org/eclipse/modisco/jee/jsp/discoverer/ui/Activator.java b/org.eclipse.modisco.jee.jsp.discoverer.ui/src/org/eclipse/modisco/jee/jsp/discoverer/ui/Activator.java
index a2e97fb23..680eb6e52 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.ui/src/org/eclipse/modisco/jee/jsp/discoverer/ui/Activator.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer.ui/src/org/eclipse/modisco/jee/jsp/discoverer/ui/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/.checkstyle b/org.eclipse.modisco.jee.jsp.discoverer/.checkstyle
index 1d1dad853..0ed6175e1 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/.checkstyle
+++ b/org.eclipse.modisco.jee.jsp.discoverer/.checkstyle
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/jee/jsp/discoverer/parser"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.jee.jsp.discoverer/.classpath b/org.eclipse.modisco.jee.jsp.discoverer/.classpath
index 2d1a4302f..ed2585fb3 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/.classpath
+++ b/org.eclipse.modisco.jee.jsp.discoverer/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/build.properties b/org.eclipse.modisco.jee.jsp.discoverer/build.properties
index 12a40d0b4..e833708bc 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/build.properties
+++ b/org.eclipse.modisco.jee.jsp.discoverer/build.properties
@@ -7,8 +7,10 @@
 #

 # Contributors:

 #    Nicolas Guyomar (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 bin.includes = META-INF/,\

                .,\

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPLexer.java b/org.eclipse.modisco.jee.jsp.discoverer/src-gen/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPLexer.java
index ac20c7317..e25aa8639 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPLexer.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src-gen/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPLexer.java
@@ -6,11 +6,11 @@
  *  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:

- *  

+ *

  *       Nicolas Guyomar (Mia-Software) - initial API and implementation

- * 

+ *

  */

   package org.eclipse.modisco.jee.jsp.discoverer.parser;

   import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;

@@ -107,7 +107,7 @@ public class JSPLexer extends Lexer {
             this.filePath = path;

         }

 

-    public JSPLexer() {;} 

+    public JSPLexer() {;}

     public JSPLexer(CharStream input) {

         super(input);

     }

@@ -120,7 +120,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:39:7: ( '>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:39:7: '>'

             {

-            match('>'); 

+            match('>');

 

             }

 

@@ -138,7 +138,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:40:7: ( '<' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:40:7: '<'

             {

-            match('<'); 

+            match('<');

 

             }

 

@@ -156,7 +156,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:41:7: ( '</jsp:element>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:41:7: '</jsp:element>'

             {

-            match("</jsp:element>"); 

+            match("</jsp:element>");

 

 

             }

@@ -175,7 +175,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:42:7: ( ';' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:42:7: ';'

             {

-            match(';'); 

+            match(';');

 

             }

 

@@ -193,7 +193,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:261:5: ( '<![CDATA[' ( options {greedy=false; } : . )* ']]>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:261:5: '<![CDATA[' ( options {greedy=false; } : . )* ']]>'

             {

-            match("<![CDATA["); 

+            match("<![CDATA[");

 

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:261:17: ( options {greedy=false; } : . )*

             loop1:

@@ -231,7 +231,7 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:261:44: .

             	    {

-            	    matchAny(); 

+            	    matchAny();

 

             	    }

             	    break;

@@ -241,7 +241,7 @@ public class JSPLexer extends Lexer {
                 }

             } while (true);

 

-            match("]]>"); 

+            match("]]>");

 

 

             }

@@ -260,12 +260,12 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1197:5: ( '<!--' ( options {greedy=false; } : . ) ( . )* '-->' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1197:5: '<!--' ( options {greedy=false; } : . ) ( . )* '-->'

             {

-            match("<!--"); 

+            match("<!--");

 

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1197:12: ( options {greedy=false; } : . )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1197:39: .

             {

-            matchAny(); 

+            matchAny();

 

             }

 

@@ -305,7 +305,7 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1197:41: .

             	    {

-            	    matchAny(); 

+            	    matchAny();

 

             	    }

             	    break;

@@ -315,7 +315,7 @@ public class JSPLexer extends Lexer {
                 }

             } while (true);

 

-            match("-->"); 

+            match("-->");

 

 

             }

@@ -334,12 +334,12 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1202:5: ( '<%--' ( options {greedy=false; } : . ) ( . )* '--%>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1202:5: '<%--' ( options {greedy=false; } : . ) ( . )* '--%>'

             {

-            match("<%--"); 

+            match("<%--");

 

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1202:12: ( options {greedy=false; } : . )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1202:39: .

             {

-            matchAny(); 

+            matchAny();

 

             }

 

@@ -388,7 +388,7 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1202:41: .

             	    {

-            	    matchAny(); 

+            	    matchAny();

 

             	    }

             	    break;

@@ -398,7 +398,7 @@ public class JSPLexer extends Lexer {
                 }

             } while (true);

 

-            match("--%>"); 

+            match("--%>");

 

 

             }

@@ -417,7 +417,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1207:3: ( '<?' ( 'x' | 'X' ) ( 'm' | 'M' ) ( 'l' | 'L' ) ( options {greedy=false; } : . )* '?>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1207:3: '<?' ( 'x' | 'X' ) ( 'm' | 'M' ) ( 'l' | 'L' ) ( options {greedy=false; } : . )* '?>'

             {

-            match("<?"); 

+            match("<?");

 

             if ( input.LA(1)=='X'||input.LA(1)=='x' ) {

                 input.consume();

@@ -476,7 +476,7 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1207:62: .

             	    {

-            	    matchAny(); 

+            	    matchAny();

 

             	    }

             	    break;

@@ -486,7 +486,7 @@ public class JSPLexer extends Lexer {
                 }

             } while (true);

 

-            match("?>"); 

+            match("?>");

 

 

             }

@@ -505,7 +505,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1212:7: ( '<!' ( 'D' | 'd' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'T' | 't' ) ( 'Y' | 'y' ) ( 'P' | 'p' ) ( 'E' | 'e' ) ( options {greedy=false; } : . )* '>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1212:7: '<!' ( 'D' | 'd' ) ( 'O' | 'o' ) ( 'C' | 'c' ) ( 'T' | 't' ) ( 'Y' | 'y' ) ( 'P' | 'p' ) ( 'E' | 'e' ) ( options {greedy=false; } : . )* '>'

             {

-            match("<!"); 

+            match("<!");

 

             if ( input.LA(1)=='D'||input.LA(1)=='d' ) {

                 input.consume();

@@ -595,7 +595,7 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1212:101: .

             	    {

-            	    matchAny(); 

+            	    matchAny();

 

             	    }

             	    break;

@@ -605,7 +605,7 @@ public class JSPLexer extends Lexer {
                 }

             } while (true);

 

-            match('>'); 

+            match('>');

 

             }

 

@@ -622,7 +622,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1215:25: ( '[' ( options {greedy=false; } : . )* ']' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1215:25: '[' ( options {greedy=false; } : . )* ']'

             {

-            match('['); 

+            match('[');

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1215:29: ( options {greedy=false; } : . )*

             loop6:

             do {

@@ -641,7 +641,7 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1215:56: .

             	    {

-            	    matchAny(); 

+            	    matchAny();

 

             	    }

             	    break;

@@ -651,7 +651,7 @@ public class JSPLexer extends Lexer {
                 }

             } while (true);

 

-            match(']'); 

+            match(']');

 

             }

 

@@ -720,49 +720,49 @@ public class JSPLexer extends Lexer {
             	case 1 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:36: LETTER

             	    {

-            	    mLETTER(); 

+            	    mLETTER();

 

             	    }

             	    break;

             	case 2 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:45: IDDigit

             	    {

-            	    mIDDigit(); 

+            	    mIDDigit();

 

             	    }

             	    break;

             	case 3 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:55: '.'

             	    {

-            	    match('.'); 

+            	    match('.');

 

             	    }

             	    break;

             	case 4 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:61: '-'

             	    {

-            	    match('-'); 

+            	    match('-');

 

             	    }

             	    break;

             	case 5 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:67: '_'

             	    {

-            	    match('_'); 

+            	    match('_');

 

             	    }

             	    break;

             	case 6 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:74: '@'

             	    {

-            	    match('@'); 

+            	    match('@');

 

             	    }

             	    break;

             	case 7 :

             	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1220:80: '°'

             	    {

-            	    match("°"); 

+            	    match("°");

 

 

             	    }

@@ -814,7 +814,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1248:5: ( '\\u0030' .. '\\u0039' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1248:5: '\\u0030' .. '\\u0039'

             {

-            matchRange('0','9'); 

+            matchRange('0','9');

 

             }

 

@@ -1059,91 +1059,91 @@ public class JSPLexer extends Lexer {
                 case 1 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1254:5: '\\u00A0' .. '\\u00FF'

                     {

-                    matchRange('\u00A0','\u00FF'); 

+                    matchRange('\u00A0','\u00FF');

 

                     }

                     break;

                 case 2 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1255:6: '{'

                     {

-                    match('{'); 

+                    match('{');

 

                     }

                     break;

                 case 3 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1256:6: '}'

                     {

-                    match('}'); 

+                    match('}');

 

                     }

                     break;

                 case 4 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1257:6: '|'

                     {

-                    match('|'); 

+                    match('|');

 

                     }

                     break;

                 case 5 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1258:6: '!'

                     {

-                    match('!'); 

+                    match('!');

 

                     }

                     break;

                 case 6 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1259:6: '#'

                     {

-                    match('#'); 

+                    match('#');

 

                     }

                     break;

                 case 7 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1260:6: '$'

                     {

-                    match('$'); 

+                    match('$');

 

                     }

                     break;

                 case 8 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1261:6: '&'

                     {

-                    match('&'); 

+                    match('&');

 

                     }

                     break;

                 case 9 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1262:6: '('

                     {

-                    match('('); 

+                    match('(');

 

                     }

                     break;

                 case 10 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1263:6: ')'

                     {

-                    match(')'); 

+                    match(')');

 

                     }

                     break;

                 case 11 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1264:6: '*'

                     {

-                    match('*'); 

+                    match('*');

 

                     }

                     break;

                 case 12 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1265:6: '+'

                     {

-                    match('+'); 

+                    match('+');

 

                     }

                     break;

                 case 13 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1266:6: ','

                     {

-                    match(','); 

+                    match(',');

 

                     }

                     break;

@@ -1165,7 +1165,7 @@ public class JSPLexer extends Lexer {
                     	case 1 :

                     	    // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1267:6: '-'

                     	    {

-                    	    match('-'); 

+                    	    match('-');

 

                     	    }

                     	    break;

@@ -1181,77 +1181,77 @@ public class JSPLexer extends Lexer {
                 case 15 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1268:6: '.'

                     {

-                    match('.'); 

+                    match('.');

 

                     }

                     break;

                 case 16 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1269:6: '\\/'

                     {

-                    match('/'); 

+                    match('/');

 

                     }

                     break;

                 case 17 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1270:6: ';'

                     {

-                    match(';'); 

+                    match(';');

 

                     }

                     break;

                 case 18 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1271:6: '?'

                     {

-                    match('?'); 

+                    match('?');

 

                     }

                     break;

                 case 19 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1272:6: '['

                     {

-                    match('['); 

+                    match('[');

 

                     }

                     break;

                 case 20 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1273:6: ']'

                     {

-                    match(']'); 

+                    match(']');

 

                     }

                     break;

                 case 21 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1274:6: '`'

                     {

-                    match('`'); 

+                    match('`');

 

                     }

                     break;

                 case 22 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1275:6: '%'

                     {

-                    match('%'); 

+                    match('%');

 

                     }

                     break;

                 case 23 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1276:6: '@'

                     {

-                    match('@'); 

+                    match('@');

 

                     }

                     break;

                 case 24 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1277:6: '\\\\'

                     {

-                    match('\\'); 

+                    match('\\');

 

                     }

                     break;

                 case 25 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1278:6: '//'

                     {

-                    match("//"); 

+                    match("//");

 

 

                     }

@@ -1259,7 +1259,7 @@ public class JSPLexer extends Lexer {
                 case 26 :

                     // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1279:6: '^'

                     {

-                    match('^'); 

+                    match('^');

 

                     }

                     break;

@@ -1279,7 +1279,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1282:10: ( '\\'' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1282:10: '\\''

             {

-            match('\''); 

+            match('\'');

 

             }

 

@@ -1297,7 +1297,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1283:10: ( '\"' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1283:10: '\"'

             {

-            match('\"'); 

+            match('\"');

 

             }

 

@@ -1315,7 +1315,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1284:10: ( ':' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1284:10: ':'

             {

-            match(':'); 

+            match(':');

 

             }

 

@@ -1333,7 +1333,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1285:10: ( '=' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1285:10: '='

             {

-            match('='); 

+            match('=');

 

             }

 

@@ -1500,7 +1500,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1307:21: ( '\\u0030' .. '\\u0039' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1307:22: '\\u0030' .. '\\u0039'

             {

-            matchRange('0','9'); 

+            matchRange('0','9');

 

             }

 

@@ -1555,7 +1555,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1311:15: ( '</' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1311:15: '</'

             {

-            match("</"); 

+            match("</");

 

 

             }

@@ -1574,7 +1574,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1314:15: ( '<%' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1314:15: '<%'

             {

-            match("<%"); 

+            match("<%");

 

 

             }

@@ -1593,7 +1593,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1315:15: ( '%>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1315:15: '%>'

             {

-            match("%>"); 

+            match("%>");

 

 

             }

@@ -1612,7 +1612,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1316:15: ( '<%=' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1316:15: '<%='

             {

-            match("<%="); 

+            match("<%=");

 

 

             }

@@ -1631,7 +1631,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1317:15: ( '<%!' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1317:15: '<%!'

             {

-            match("<%!"); 

+            match("<%!");

 

 

             }

@@ -1650,7 +1650,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1318:15: ( '<%@' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1318:15: '<%@'

             {

-            match("<%@"); 

+            match("<%@");

 

 

             }

@@ -1669,7 +1669,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1319:15: ( '/>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1319:15: '/>'

             {

-            match("/>"); 

+            match("/>");

 

 

             }

@@ -1688,7 +1688,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1322:15: ( '<jsp:useBean' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1322:15: '<jsp:useBean'

             {

-            match("<jsp:useBean"); 

+            match("<jsp:useBean");

 

 

             }

@@ -1707,7 +1707,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1323:15: ( '<jsp:setProperty' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1323:15: '<jsp:setProperty'

             {

-            match("<jsp:setProperty"); 

+            match("<jsp:setProperty");

 

 

             }

@@ -1726,7 +1726,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1324:15: ( '<jsp:getProperty' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1324:15: '<jsp:getProperty'

             {

-            match("<jsp:getProperty"); 

+            match("<jsp:getProperty");

 

 

             }

@@ -1745,7 +1745,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1325:15: ( '<jsp:include' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1325:15: '<jsp:include'

             {

-            match("<jsp:include"); 

+            match("<jsp:include");

 

 

             }

@@ -1764,7 +1764,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1326:15: ( '</jsp:include>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1326:15: '</jsp:include>'

             {

-            match("</jsp:include>"); 

+            match("</jsp:include>");

 

 

             }

@@ -1783,7 +1783,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1327:15: ( '<jsp:forward' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1327:15: '<jsp:forward'

             {

-            match("<jsp:forward"); 

+            match("<jsp:forward");

 

 

             }

@@ -1802,7 +1802,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1328:15: ( '</jsp:forward>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1328:15: '</jsp:forward>'

             {

-            match("</jsp:forward>"); 

+            match("</jsp:forward>");

 

 

             }

@@ -1821,7 +1821,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1329:15: ( '<jsp:plugin' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1329:15: '<jsp:plugin'

             {

-            match("<jsp:plugin"); 

+            match("<jsp:plugin");

 

 

             }

@@ -1840,7 +1840,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1330:15: ( '</jsp:plugin>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1330:15: '</jsp:plugin>'

             {

-            match("</jsp:plugin>"); 

+            match("</jsp:plugin>");

 

 

             }

@@ -1859,7 +1859,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1331:15: ( '<jsp:fallback>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1331:15: '<jsp:fallback>'

             {

-            match("<jsp:fallback>"); 

+            match("<jsp:fallback>");

 

 

             }

@@ -1878,7 +1878,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1332:15: ( '</jsp:fallback>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1332:15: '</jsp:fallback>'

             {

-            match("</jsp:fallback>"); 

+            match("</jsp:fallback>");

 

 

             }

@@ -1897,7 +1897,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1333:15: ( '<jsp:param' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1333:15: '<jsp:param'

             {

-            match("<jsp:param"); 

+            match("<jsp:param");

 

 

             }

@@ -1916,7 +1916,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1334:15: ( '<jsp:params>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1334:15: '<jsp:params>'

             {

-            match("<jsp:params>"); 

+            match("<jsp:params>");

 

 

             }

@@ -1935,7 +1935,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1335:15: ( '</jsp:params>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1335:15: '</jsp:params>'

             {

-            match("</jsp:params>"); 

+            match("</jsp:params>");

 

 

             }

@@ -1954,7 +1954,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1336:15: ( '<jsp:root' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1336:15: '<jsp:root'

             {

-            match("<jsp:root"); 

+            match("<jsp:root");

 

 

             }

@@ -1973,7 +1973,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1337:15: ( '</jsp:root>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1337:15: '</jsp:root>'

             {

-            match("</jsp:root>"); 

+            match("</jsp:root>");

 

 

             }

@@ -1992,7 +1992,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1338:15: ( '<jsp:text>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1338:15: '<jsp:text>'

             {

-            match("<jsp:text>"); 

+            match("<jsp:text>");

 

 

             }

@@ -2011,7 +2011,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1339:15: ( '</jsp:text>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1339:15: '</jsp:text>'

             {

-            match("</jsp:text>"); 

+            match("</jsp:text>");

 

 

             }

@@ -2030,7 +2030,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1340:15: ( '</jsp:attribute>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1340:15: '</jsp:attribute>'

             {

-            match("</jsp:attribute>"); 

+            match("</jsp:attribute>");

 

 

             }

@@ -2049,7 +2049,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1341:15: ( '<jsp:attribute' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1341:15: '<jsp:attribute'

             {

-            match("<jsp:attribute"); 

+            match("<jsp:attribute");

 

 

             }

@@ -2068,7 +2068,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1342:15: ( '<jsp:body>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1342:15: '<jsp:body>'

             {

-            match("<jsp:body>"); 

+            match("<jsp:body>");

 

 

             }

@@ -2087,7 +2087,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1343:15: ( '</jsp:body>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1343:15: '</jsp:body>'

             {

-            match("</jsp:body>"); 

+            match("</jsp:body>");

 

 

             }

@@ -2106,7 +2106,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1344:16: ( '<jsp:invoke' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1344:16: '<jsp:invoke'

             {

-            match("<jsp:invoke"); 

+            match("<jsp:invoke");

 

 

             }

@@ -2125,7 +2125,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1345:16: ( '<jsp:doBody' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1345:16: '<jsp:doBody'

             {

-            match("<jsp:doBody"); 

+            match("<jsp:doBody");

 

 

             }

@@ -2144,7 +2144,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1346:16: ( '<jsp:output' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1346:16: '<jsp:output'

             {

-            match("<jsp:output"); 

+            match("<jsp:output");

 

 

             }

@@ -2163,7 +2163,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1347:16: ( '<jsp:element' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1347:16: '<jsp:element'

             {

-            match("<jsp:element"); 

+            match("<jsp:element");

 

 

             }

@@ -2182,7 +2182,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1351:15: ( '<jsp:scriptlet>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1351:15: '<jsp:scriptlet>'

             {

-            match("<jsp:scriptlet>"); 

+            match("<jsp:scriptlet>");

 

 

             }

@@ -2201,7 +2201,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1352:17: ( '</jsp:scriptlet>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1352:17: '</jsp:scriptlet>'

             {

-            match("</jsp:scriptlet>"); 

+            match("</jsp:scriptlet>");

 

 

             }

@@ -2220,7 +2220,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1353:15: ( '<jsp:expression>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1353:15: '<jsp:expression>'

             {

-            match("<jsp:expression>"); 

+            match("<jsp:expression>");

 

 

             }

@@ -2239,7 +2239,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1354:15: ( '</jsp:expression>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1354:15: '</jsp:expression>'

             {

-            match("</jsp:expression>"); 

+            match("</jsp:expression>");

 

 

             }

@@ -2258,7 +2258,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1355:15: ( '<jsp:declaration>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1355:15: '<jsp:declaration>'

             {

-            match("<jsp:declaration>"); 

+            match("<jsp:declaration>");

 

 

             }

@@ -2277,7 +2277,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1356:15: ( '</jsp:declaration>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1356:15: '</jsp:declaration>'

             {

-            match("</jsp:declaration>"); 

+            match("</jsp:declaration>");

 

 

             }

@@ -2296,7 +2296,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1357:15: ( '<jsp:directive.' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1357:15: '<jsp:directive.'

             {

-            match("<jsp:directive."); 

+            match("<jsp:directive.");

 

 

             }

@@ -2315,7 +2315,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1360:15: ( '<%--' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1360:15: '<%--'

             {

-            match("<%--"); 

+            match("<%--");

 

 

             }

@@ -2334,7 +2334,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1361:15: ( '--%>' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1361:15: '--%>'

             {

-            match("--%>"); 

+            match("--%>");

 

 

             }

@@ -2353,7 +2353,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1362:15: ( '<!--' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1362:15: '<!--'

             {

-            match("<!--"); 

+            match("<!--");

 

 

             }

@@ -2372,7 +2372,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1363:15: ( '-->' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1363:15: '-->'

             {

-            match("-->"); 

+            match("-->");

 

 

             }

@@ -2391,7 +2391,7 @@ public class JSPLexer extends Lexer {
             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1365:15: ( '<?xml' )

             // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1365:15: '<?xml'

             {

-            match("<?xml"); 

+            match("<?xml");

 

 

             }

@@ -2411,441 +2411,441 @@ public class JSPLexer extends Lexer {
             case 1 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:10: T66

                 {

-                mT66(); 

+                mT66();

 

                 }

                 break;

             case 2 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:14: T67

                 {

-                mT67(); 

+                mT67();

 

                 }

                 break;

             case 3 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:18: T68

                 {

-                mT68(); 

+                mT68();

 

                 }

                 break;

             case 4 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:22: T69

                 {

-                mT69(); 

+                mT69();

 

                 }

                 break;

             case 5 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:26: CDATA

                 {

-                mCDATA(); 

+                mCDATA();

 

                 }

                 break;

             case 6 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:32: LINE_COMMENT

                 {

-                mLINE_COMMENT(); 

+                mLINE_COMMENT();

 

                 }

                 break;

             case 7 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:45: JSP_COMMENT

                 {

-                mJSP_COMMENT(); 

+                mJSP_COMMENT();

 

                 }

                 break;

             case 8 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:57: XMLDECL

                 {

-                mXMLDECL(); 

+                mXMLDECL();

 

                 }

                 break;

             case 9 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:65: DOCTYPE

                 {

-                mDOCTYPE(); 

+                mDOCTYPE();

 

                 }

                 break;

             case 10 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:73: ID

                 {

-                mID(); 

+                mID();

 

                 }

                 break;

             case 11 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:76: SpecialCharacter

                 {

-                mSpecialCharacter(); 

+                mSpecialCharacter();

 

                 }

                 break;

             case 12 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:93: SQUOTE

                 {

-                mSQUOTE(); 

+                mSQUOTE();

 

                 }

                 break;

             case 13 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:100: DQUOTE

                 {

-                mDQUOTE(); 

+                mDQUOTE();

 

                 }

                 break;

             case 14 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:107: DDOT

                 {

-                mDDOT(); 

+                mDDOT();

 

                 }

                 break;

             case 15 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:112: EQUAL

                 {

-                mEQUAL(); 

+                mEQUAL();

 

                 }

                 break;

             case 16 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:118: WS

                 {

-                mWS(); 

+                mWS();

 

                 }

                 break;

             case 17 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:121: WS2

                 {

-                mWS2(); 

+                mWS2();

 

                 }

                 break;

             case 18 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:125: Digit

                 {

-                mDigit(); 

+                mDigit();

 

                 }

                 break;

             case 19 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:131: OPENCLOSE

                 {

-                mOPENCLOSE(); 

+                mOPENCLOSE();

 

                 }

                 break;

             case 20 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:141: JSPTAGOPEN

                 {

-                mJSPTAGOPEN(); 

+                mJSPTAGOPEN();

 

                 }

                 break;

             case 21 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:152: JSPTAGCLOSE

                 {

-                mJSPTAGCLOSE(); 

+                mJSPTAGCLOSE();

 

                 }

                 break;

             case 22 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:164: JSPOPENEXPR

                 {

-                mJSPOPENEXPR(); 

+                mJSPOPENEXPR();

 

                 }

                 break;

             case 23 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:176: JSPOPENDECL

                 {

-                mJSPOPENDECL(); 

+                mJSPOPENDECL();

 

                 }

                 break;

             case 24 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:188: JSPOPENDIR

                 {

-                mJSPOPENDIR(); 

+                mJSPOPENDIR();

 

                 }

                 break;

             case 25 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:199: JSPCLOSEACT

                 {

-                mJSPCLOSEACT(); 

+                mJSPCLOSEACT();

 

                 }

                 break;

             case 26 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:211: JSPUSEBEAN

                 {

-                mJSPUSEBEAN(); 

+                mJSPUSEBEAN();

 

                 }

                 break;

             case 27 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:222: JSPSET

                 {

-                mJSPSET(); 

+                mJSPSET();

 

                 }

                 break;

             case 28 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:229: JSPGET

                 {

-                mJSPGET(); 

+                mJSPGET();

 

                 }

                 break;

             case 29 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:236: JSPOPENINC

                 {

-                mJSPOPENINC(); 

+                mJSPOPENINC();

 

                 }

                 break;

             case 30 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:247: JSPCLOSEINC

                 {

-                mJSPCLOSEINC(); 

+                mJSPCLOSEINC();

 

                 }

                 break;

             case 31 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:259: JSPOPENFWD

                 {

-                mJSPOPENFWD(); 

+                mJSPOPENFWD();

 

                 }

                 break;

             case 32 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:270: JSPCLOSEFWD

                 {

-                mJSPCLOSEFWD(); 

+                mJSPCLOSEFWD();

 

                 }

                 break;

             case 33 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:282: JSPOPENPLUG

                 {

-                mJSPOPENPLUG(); 

+                mJSPOPENPLUG();

 

                 }

                 break;

             case 34 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:294: JSPCLOSEPLUG

                 {

-                mJSPCLOSEPLUG(); 

+                mJSPCLOSEPLUG();

 

                 }

                 break;

             case 35 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:307: JSPOPENFALL

                 {

-                mJSPOPENFALL(); 

+                mJSPOPENFALL();

 

                 }

                 break;

             case 36 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:319: JSPCLOSEFALL

                 {

-                mJSPCLOSEFALL(); 

+                mJSPCLOSEFALL();

 

                 }

                 break;

             case 37 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:332: JSPOPENPARA

                 {

-                mJSPOPENPARA(); 

+                mJSPOPENPARA();

 

                 }

                 break;

             case 38 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:344: JSPOPENPARAS

                 {

-                mJSPOPENPARAS(); 

+                mJSPOPENPARAS();

 

                 }

                 break;

             case 39 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:357: JSPCLOSEPARAS

                 {

-                mJSPCLOSEPARAS(); 

+                mJSPCLOSEPARAS();

 

                 }

                 break;

             case 40 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:371: JSPOPENROOT

                 {

-                mJSPOPENROOT(); 

+                mJSPOPENROOT();

 

                 }

                 break;

             case 41 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:383: JSPCLOSEROOT

                 {

-                mJSPCLOSEROOT(); 

+                mJSPCLOSEROOT();

 

                 }

                 break;

             case 42 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:396: JSPOPENTEXT

                 {

-                mJSPOPENTEXT(); 

+                mJSPOPENTEXT();

 

                 }

                 break;

             case 43 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:408: JSPCLOSETEXT

                 {

-                mJSPCLOSETEXT(); 

+                mJSPCLOSETEXT();

 

                 }

                 break;

             case 44 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:421: JSPCLOSEATTR

                 {

-                mJSPCLOSEATTR(); 

+                mJSPCLOSEATTR();

 

                 }

                 break;

             case 45 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:434: JSPOPENATTR

                 {

-                mJSPOPENATTR(); 

+                mJSPOPENATTR();

 

                 }

                 break;

             case 46 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:446: JSPOPENBODY

                 {

-                mJSPOPENBODY(); 

+                mJSPOPENBODY();

 

                 }

                 break;

             case 47 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:458: JSPCLOSEBODY

                 {

-                mJSPCLOSEBODY(); 

+                mJSPCLOSEBODY();

 

                 }

                 break;

             case 48 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:471: JSPOPENINVOKE

                 {

-                mJSPOPENINVOKE(); 

+                mJSPOPENINVOKE();

 

                 }

                 break;

             case 49 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:485: JSPOPENDOBODY

                 {

-                mJSPOPENDOBODY(); 

+                mJSPOPENDOBODY();

 

                 }

                 break;

             case 50 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:499: JSPOPENOUTPUT

                 {

-                mJSPOPENOUTPUT(); 

+                mJSPOPENOUTPUT();

 

                 }

                 break;

             case 51 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:513: JSPELEMENTOP

                 {

-                mJSPELEMENTOP(); 

+                mJSPELEMENTOP();

 

                 }

                 break;

             case 52 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:526: OPENSCRIPLET

                 {

-                mOPENSCRIPLET(); 

+                mOPENSCRIPLET();

 

                 }

                 break;

             case 53 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:539: CLOSESCRIPTLET

                 {

-                mCLOSESCRIPTLET(); 

+                mCLOSESCRIPTLET();

 

                 }

                 break;

             case 54 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:554: OPENEXPR

                 {

-                mOPENEXPR(); 

+                mOPENEXPR();

 

                 }

                 break;

             case 55 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:563: CLOSEEXPR

                 {

-                mCLOSEEXPR(); 

+                mCLOSEEXPR();

 

                 }

                 break;

             case 56 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:573: OPENDECL

                 {

-                mOPENDECL(); 

+                mOPENDECL();

 

                 }

                 break;

             case 57 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:582: CLOSEDECL

                 {

-                mCLOSEDECL(); 

+                mCLOSEDECL();

 

                 }

                 break;

             case 58 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:592: OPENDIRECT

                 {

-                mOPENDIRECT(); 

+                mOPENDIRECT();

 

                 }

                 break;

             case 59 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:603: OPENJSPCMT

                 {

-                mOPENJSPCMT(); 

+                mOPENJSPCMT();

 

                 }

                 break;

             case 60 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:614: CLOSEJSPCMT

                 {

-                mCLOSEJSPCMT(); 

+                mCLOSEJSPCMT();

 

                 }

                 break;

             case 61 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:626: OPENXMLCMT

                 {

-                mOPENXMLCMT(); 

+                mOPENXMLCMT();

 

                 }

                 break;

             case 62 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:637: CLOSEXMLCMT

                 {

-                mCLOSEXMLCMT(); 

+                mCLOSEXMLCMT();

 

                 }

                 break;

             case 63 :

                 // C:\\Documents and Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:1:649: XMLDECLOPEN

                 {

-                mXMLDECLOPEN(); 

+                mXMLDECLOPEN();

 

                 }

                 break;

@@ -3045,6 +3045,6 @@ public class JSPLexer extends Lexer {
             return "1:1: Tokens : ( T66 | T67 | T68 | T69 | CDATA | LINE_COMMENT | JSP_COMMENT | XMLDECL | DOCTYPE | ID | SpecialCharacter | SQUOTE | DQUOTE | DDOT | EQUAL | WS | WS2 | Digit | OPENCLOSE | JSPTAGOPEN | JSPTAGCLOSE | JSPOPENEXPR | JSPOPENDECL | JSPOPENDIR | JSPCLOSEACT | JSPUSEBEAN | JSPSET | JSPGET | JSPOPENINC | JSPCLOSEINC | JSPOPENFWD | JSPCLOSEFWD | JSPOPENPLUG | JSPCLOSEPLUG | JSPOPENFALL | JSPCLOSEFALL | JSPOPENPARA | JSPOPENPARAS | JSPCLOSEPARAS | JSPOPENROOT | JSPCLOSEROOT | JSPOPENTEXT | JSPCLOSETEXT | JSPCLOSEATTR | JSPOPENATTR | JSPOPENBODY | JSPCLOSEBODY | JSPOPENINVOKE | JSPOPENDOBODY | JSPOPENOUTPUT | JSPELEMENTOP | OPENSCRIPLET | CLOSESCRIPTLET | OPENEXPR | CLOSEEXPR | OPENDECL | CLOSEDECL | OPENDIRECT | OPENJSPCMT | CLOSEJSPCMT | OPENXMLCMT | CLOSEXMLCMT | XMLDECLOPEN );";

         }

     }

- 

+

 

 }

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPParser.java b/org.eclipse.modisco.jee.jsp.discoverer/src-gen/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPParser.java
index df3756601..417d34649 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPParser.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src-gen/org/eclipse/modisco/jee/jsp/discoverer/parser/JSPParser.java
@@ -6,11 +6,11 @@
  *  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:

- *  

+ *

  *       Nicolas Guyomar (Mia-Software) - initial API and implementation

- * 

+ *

  */

 package org.eclipse.modisco.jee.jsp.discoverer.parser;

 

@@ -150,7 +150,7 @@ public class JSPParser extends Parser {
 

 	/**

 	 * Generic method which link a child to his parent

-	 * 

+	 *

 	 * @param parentPage

 	 *            The page itself

 	 * @param parentTag

@@ -181,7 +181,7 @@ public class JSPParser extends Parser {
 	 * This method recreates the tree hierarchy of the file Given the name of a closing tag, it look

 	 * in the list of all the encountered tags to find the opening one. Every tag between those two

 	 * is considered to be a son of the opening one

-	 * 

+	 *

 	 * @param closeTagName

 	 *            the name of the closing tag encountered

 	 */

@@ -229,7 +229,7 @@ public class JSPParser extends Parser {
 	 * This method concatenate every token contained within the beginning of the tag and the token

 	 * matching the given token ID It is very usefull to retriveve content for JSP Scriplet for

 	 * instance

-	 * 

+	 *

 	 * @param tokenID

 	 *            the ID of the closing token in the token list

 	 * @param tag

@@ -976,7 +976,7 @@ public class JSPParser extends Parser {
 

 				match(input, 66, FOLLOW_66_in_endtag553);

 

-				String endTagName = id1.getText() + (id2 != null ? ":" + id2.getText() : ""); //$NON-NLS-1$     

+				String endTagName = id1.getText() + (id2 != null ? ":" + id2.getText() : ""); //$NON-NLS-1$

 				resolveChild(endTagName);

 

 			}

@@ -1050,7 +1050,7 @@ public class JSPParser extends Parser {
 					id1 = (Token) input.LT(1);

 					match(input, ID, FOLLOW_ID_in_tag628);

 

-					isJavascript = id1.getText().equalsIgnoreCase("script");//$NON-NLS-1$      

+					isJavascript = id1.getText().equalsIgnoreCase("script");//$NON-NLS-1$

 					if (isJavascript) {

 						tag = this.factory.createJavaScript();

 						String tmp = id1.getText();

@@ -1065,9 +1065,9 @@ public class JSPParser extends Parser {
 							if (input.LT(1).getText() != null && input.LT(2).getText() != null

 									&& input.LT(3).getText() != null) {

 								// End of script tag

-								if (input.LT(1).getText().equalsIgnoreCase("</")//$NON-NLS-1$ 

-										&& input.LT(2).getText().equalsIgnoreCase("script")//$NON-NLS-1$  

-										&& input.LT(3).getText().equalsIgnoreCase(">")) //$NON-NLS-1$  

+								if (input.LT(1).getText().equalsIgnoreCase("</")//$NON-NLS-1$

+										&& input.LT(2).getText().equalsIgnoreCase("script")//$NON-NLS-1$

+										&& input.LT(3).getText().equalsIgnoreCase(">")) //$NON-NLS-1$

 								{

 									// We need to consume the 3 next token for '</' 'script' '>'

 									input.consume();

@@ -1076,7 +1076,7 @@ public class JSPParser extends Parser {
 									break loop1;

 								}

 								// end of the tag script element

-								else if (input.LT(1).getText().equalsIgnoreCase(">") && tagHeader)//$NON-NLS-1$  

+								else if (input.LT(1).getText().equalsIgnoreCase(">") && tagHeader)//$NON-NLS-1$

 								{

 									// We need to retrieve the content of the tag, eg : attributes

 									tag.setName(text);

@@ -2934,7 +2934,7 @@ public class JSPParser extends Parser {
 			// '</jsp:forward>'

 			{

 

-				tag = createJSPStdAction(parent, "jsp:forward");//$NON-NLS-1$ 

+				tag = createJSPStdAction(parent, "jsp:forward");//$NON-NLS-1$

 

 				match(input, JSPOPENFWD, FOLLOW_JSPOPENFWD_in_jsp_forward2409);

 				// C:\\Documents and

@@ -3224,7 +3224,7 @@ public class JSPParser extends Parser {
 			// '<jsp:fallback>' '</jsp:fallback>'

 			{

 

-				tag = createJSPStdAction(parent, "jsp:fallback");//$NON-NLS-1$         

+				tag = createJSPStdAction(parent, "jsp:fallback");//$NON-NLS-1$

 

 				match(input, JSPOPENFALL, FOLLOW_JSPOPENFALL_in_jsp_fallback2564);

 				getTagContent(JSPCLOSEFALL, tag);

@@ -3261,7 +3261,7 @@ public class JSPParser extends Parser {
 			// '<jsp:getProperty' ( attribute[tag] | comment[tag] | WS )* '/>'

 			{

 

-				tag = createJSPStdAction(parent, "jsp:getProperty");//$NON-NLS-1$ 

+				tag = createJSPStdAction(parent, "jsp:getProperty");//$NON-NLS-1$

 

 				match(input, JSPGET, FOLLOW_JSPGET_in_jsp_getProperty2628);

 				// C:\\Documents and

@@ -4111,7 +4111,7 @@ public class JSPParser extends Parser {
 			// jsp_element[tag] | comment[tag] | WS )* '</jsp:attribute>' ) )

 			{

 

-				tag = createJSPStdAction(parent, "jsp:attribute");//$NON-NLS-1$       

+				tag = createJSPStdAction(parent, "jsp:attribute");//$NON-NLS-1$

 

 				// C:\\Documents and

 				// Settings\\Nguyomar\\workspace\\org.eclipse.modisco.jee.jsp.discoverer\\resources\\internal\\JSP.g:904:5:

@@ -4335,13 +4335,13 @@ public class JSPParser extends Parser {
 			// '<jsp:text>' '</jsp:text>'

 			{

 

-				tag = createJSPStdAction(parent, "jsp:text");//$NON-NLS-1$   

+				tag = createJSPStdAction(parent, "jsp:text");//$NON-NLS-1$

 

 				match(input, JSPOPENTEXT, FOLLOW_JSPOPENTEXT_in_jsp_text3269);

 				getTagContent(JSPCLOSETEXT, tag);

 				match(input, JSPCLOSETEXT, FOLLOW_JSPCLOSETEXT_in_jsp_text3273);

 

-				tag.setName("jsp:text"); //$NON-NLS-1$   

+				tag.setName("jsp:text"); //$NON-NLS-1$

 

 			}

 

@@ -4689,7 +4689,7 @@ public class JSPParser extends Parser {
 					}

 					}

 

-					content += space + input.get(input.mark()).getText(); //$NON-NLS-1$                        

+					content += space + input.get(input.mark()).getText(); //$NON-NLS-1$

 					matchAny(input);

 

 				} while (true);

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java
index 747514505..1c663e860 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/AbstractJspDiscoverer.java
@@ -4,7 +4,7 @@
  * 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:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - adapted to new discovery framework (Bug 335003)

@@ -37,7 +37,7 @@ public abstract class AbstractJspDiscoverer<T> extends AbstractModelDiscoverer<T
 

 	/**

 	 * get the JSP Factory

-	 * 

+	 *

 	 * @return the JSP Factory

 	 */

 	protected static JspFactory getEFactory() {

@@ -86,7 +86,7 @@ public abstract class AbstractJspDiscoverer<T> extends AbstractModelDiscoverer<T
 

 	/**

 	 * Recursively discover all JSP files contained in the given directory into the given JSP model

-	 * 

+	 *

 	 * @throws DiscoveryException

 	 */

 	protected static void discoverDirectory(final File directory, final Model model)

diff --git a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/JspActivator.java b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/JspActivator.java
index e6daa2866..bb4fb88de 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/JspActivator.java
+++ b/org.eclipse.modisco.jee.jsp.discoverer/src/org/eclipse/modisco/jee/jsp/discoverer/JspActivator.java
@@ -4,7 +4,7 @@
  * 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:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - adapted to new discovery framework (Bug 335003)

@@ -34,7 +34,7 @@ public class JspActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext )

 	 */

 	@Override

@@ -45,7 +45,7 @@ public class JspActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext )

 	 */

 	@Override

@@ -56,7 +56,7 @@ public class JspActivator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JspActivator getDefault() {

diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/.checkstyle b/org.eclipse.modisco.jee.jsp.generation.tests/.checkstyle
index 349754695..5c97ead4f 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/.checkstyle
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="Local" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="Local" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="Local" local="true">
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java
index 91af7ba0d..55469f6d3 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Activator.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Fabien Giquel (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.jsp.generation.tests;

@@ -36,7 +36,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -49,7 +49,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -62,7 +62,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java
index 30d87dbd4..fbfc03627 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/DiffGeneratedJspTest.java
@@ -68,7 +68,7 @@ public class DiffGeneratedJspTest {
 					".jsp")); //$NON-NLS-1$

 		}

 	}

-	

+

 	/** Bug 368698 - GenerateJsp.emtl is missing in org.eclipse.modisco.jee.jsp.generation */

 	@Test

 	public void testEmtlFilePresent() {

diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/JSPFileComparator.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/JSPFileComparator.java
index d8a87dd8b..b28f2fa75 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/JSPFileComparator.java
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/JSPFileComparator.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Fabien Giquel (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.jsp.generation.tests;

@@ -16,7 +16,7 @@ import java.util.Comparator;
 

 /**

  * TODO specific file comparator : neutralize JSP shape variations

- * 

+ *

  */

 public class JSPFileComparator implements Comparator<File> {

 

diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Messages.java b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Messages.java
index 31181a10f..32a25fa73 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Messages.java
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/src/org/eclipse/modisco/jee/jsp/generation/tests/Messages.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Fabien Giquel (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.jsp.generation.tests;

diff --git a/org.eclipse.modisco.jee.jsp.generation/.checkstyle b/org.eclipse.modisco.jee.jsp.generation/.checkstyle
index 316bf5bea..8e542d913 100644
--- a/org.eclipse.modisco.jee.jsp.generation/.checkstyle
+++ b/org.eclipse.modisco.jee.jsp.generation/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="local" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="local" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="local" local="true">
diff --git a/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/Activator.java b/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/Activator.java
index 0273a19be..008299f35 100644
--- a/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/Activator.java
+++ b/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/Activator.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.jsp.generation;

@@ -38,7 +38,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.core.runtime.Plugin#start(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -49,7 +49,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -60,7 +60,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance.

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/files/GenerateJsp.java b/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/files/GenerateJsp.java
index 7beda673f..9c35be969 100644
--- a/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/files/GenerateJsp.java
+++ b/org.eclipse.modisco.jee.jsp.generation/src/org/eclipse/modisco/jee/jsp/generation/files/GenerateJsp.java
@@ -26,21 +26,21 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 

 /**

  * Entry point of the 'GenerateJsp' generation module.

- * 

+ *

  * @generated

  */

 @SuppressWarnings("all")

 public class GenerateJsp extends AbstractAcceleoGenerator {

 	/**

 	 * The name of the module.

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final String MODULE_FILE_NAME = "GenerateJsp"; //$NON-NLS-1$

 

 	/**

 	 * The name of the templates that are to be generated.

-	 * 

+	 *

 	 * @generated

 	 */

 	public static final String[] TEMPLATE_NAMES = { "write", }; //$NON-NLS-1$

@@ -56,7 +56,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	 * retrieval of {@link #getProperties()} and

 	 * {@link #getGenerationListeners()}.

 	 * </p>

-	 * 

+	 *

 	 * @generated

 	 */

 	public GenerateJsp() {

@@ -66,7 +66,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	/**

 	 * This allows clients to instantiates a generator with all required

 	 * information.

-	 * 

+	 *

 	 * @param modelURI

 	 *            URI where the model on which this generator will be used is

 	 *            located.

@@ -90,7 +90,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	/**

 	 * This allows clients to instantiates a generator with all required

 	 * information.

-	 * 

+	 *

 	 * @param model

 	 *            We'll iterate over the content of this element to find Objects

 	 *            matching the first parameter of the template we need to call.

@@ -113,7 +113,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 

 	/**

 	 * This can be used to launch the generation from a standalone application.

-	 * 

+	 *

 	 * @param args

 	 *            Arguments of the generation.

 	 * @generated

@@ -139,7 +139,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 

 	/**

 	 * Launches the generation described by this instance.

-	 * 

+	 *

 	 * @param monitor

 	 *            This will be used to display progress information to the user.

 	 * @throws IOException

@@ -159,7 +159,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	/**

 	 * If this generator needs to listen to text generation events, listeners

 	 * can be returned from here.

-	 * 

+	 *

 	 * @return List of listeners that are to be notified when text is generated

 	 *         through this launch.

 	 * @generated

@@ -193,7 +193,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	 * <p>

 	 * All three of these default strategies support merging through JMerge.

 	 * </p>

-	 * 

+	 *

 	 * @return The generation strategy that is to be used for generations

 	 *         launched through this launcher.

 	 * @generated

@@ -206,7 +206,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	 * This will be called in order to find and load the module that will be

 	 * launched through this launcher. We expect this name not to contain file

 	 * extension, and the module to be located beside the launcher.

-	 * 

+	 *

 	 * @return The name of the module that is to be launched.

 	 * @generated

 	 */

@@ -228,7 +228,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	 * that needs be returned by a call to {@link #getProperties()} is

 	 * "org.eclipse.acceleo.sample.messages".

 	 * </p>

-	 * 

+	 *

 	 * @return The list of properties file we need to add to the generation

 	 *         context.

 	 * @see java.util.ResourceBundle#getBundle(String)

@@ -252,7 +252,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	/**

 	 * This will be used to get the list of templates that are to be launched by

 	 * this launcher.

-	 * 

+	 *

 	 * @return The list of templates to call on the module

 	 *         {@link #getModuleName()}.

 	 * @generated

@@ -265,7 +265,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	/**

 	 * This can be used to update the resource set's package registry with all

 	 * needed EPackages.

-	 * 

+	 *

 	 * @param resourceSet

 	 *            The resource set which registry has to be updated.

 	 * @generated

@@ -282,7 +282,7 @@ public class GenerateJsp extends AbstractAcceleoGenerator {
 	/**

 	 * This can be used to update the resource set's resource factory registry

 	 * with all needed factories.

-	 * 

+	 *

 	 * @param resourceSet

 	 *            The resource set which registry has to be updated.

 	 * @generated

diff --git a/org.eclipse.modisco.jee.jsp/.checkstyle b/org.eclipse.modisco.jee.jsp/.checkstyle
index 565cc636c..a1a6e8a59 100644
--- a/org.eclipse.modisco.jee.jsp/.checkstyle
+++ b/org.eclipse.modisco.jee.jsp/.checkstyle
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Local" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="Local" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="Local" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/jee"/>
-    <filter-data value="src/org/eclipse/modisco/jee/jsp"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.jee.jsp/.classpath b/org.eclipse.modisco.jee.jsp/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.jee.jsp/.classpath
+++ b/org.eclipse.modisco.jee.jsp/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.jee.jsp/build.properties b/org.eclipse.modisco.jee.jsp/build.properties
index d2aab4424..b3562a78d 100644
--- a/org.eclipse.modisco.jee.jsp/build.properties
+++ b/org.eclipse.modisco.jee.jsp/build.properties
@@ -1,5 +1,5 @@
 # <copyright>

-#Copyright (c) 2010 Mia-Software.

+#Copyright (c) 2010, 2018 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

@@ -7,6 +7,7 @@
 #

 #Contributors:

 #    Nicolas Guyomar (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # </copyright>

 #

 # $Id$

@@ -18,6 +19,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.jee.jsp/model/JSP.genmodel b/org.eclipse.modisco.jee.jsp/model/JSP.genmodel
index 1727e50e7..217228fcd 100644
--- a/org.eclipse.modisco.jee.jsp/model/JSP.genmodel
+++ b/org.eclipse.modisco.jee.jsp/model/JSP.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2010 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;  &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.jsp/src" modelPluginID="org.eclipse.modisco.jee.jsp"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;  &#x9;   Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.jsp/src-gen" modelPluginID="org.eclipse.modisco.jee.jsp"

     modelName="JSP" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.gmt.modisco.xml/model/xml.genmodel#//xml">

   <foreignModel>JSP.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/ComposedAttribute.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/ComposedAttribute.java
index 6da702261..6da702261 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/ComposedAttribute.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/ComposedAttribute.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPAction.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPAction.java
index 347ec0c58..347ec0c58 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPAction.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPAction.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPComment.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPComment.java
index c437fd8ab..c437fd8ab 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPComment.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPComment.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPDeclaration.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPDeclaration.java
index ccbf21fc0..ccbf21fc0 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPDeclaration.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPDeclaration.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPDirective.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPDirective.java
index 0463fa341..0463fa341 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPDirective.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPDirective.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPExpression.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPExpression.java
index 094daf485..094daf485 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPExpression.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPExpression.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPScript.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPScript.java
index eb4ae8c31..eb4ae8c31 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPScript.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPScript.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPScriptlet.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPScriptlet.java
index c3103efeb..c3103efeb 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPScriptlet.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPScriptlet.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPStdAction.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPStdAction.java
index 3ffc119ef..3ffc119ef 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPStdAction.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPStdAction.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPTagLib.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPTagLib.java
index b31ec09f9..b31ec09f9 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JSPTagLib.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JSPTagLib.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JavaScript.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JavaScript.java
index 5faa3be3b..5faa3be3b 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JavaScript.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JavaScript.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JspFactory.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JspFactory.java
index 641879fc2..641879fc2 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JspFactory.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JspFactory.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JspPackage.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JspPackage.java
index 53b678b11..53b678b11 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/JspPackage.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/JspPackage.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/Model.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/Model.java
index 005c5e18d..005c5e18d 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/Model.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/Model.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/Page.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/Page.java
index 0e105b6b2..0e105b6b2 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/Page.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/Page.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/ComposedAttributeImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/ComposedAttributeImpl.java
index 7061e2829..7061e2829 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/ComposedAttributeImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/ComposedAttributeImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPActionImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPActionImpl.java
index d6c33cb76..d6c33cb76 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPActionImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPActionImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPCommentImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPCommentImpl.java
index 0bbb8742f..0bbb8742f 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPCommentImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPCommentImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPDeclarationImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPDeclarationImpl.java
index 41e55b882..41e55b882 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPDeclarationImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPDeclarationImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPDirectiveImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPDirectiveImpl.java
index db5fa1b28..db5fa1b28 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPDirectiveImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPDirectiveImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPExpressionImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPExpressionImpl.java
index cc87c4865..cc87c4865 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPExpressionImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPExpressionImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPScriptImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPScriptImpl.java
index 1297a3f6c..1297a3f6c 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPScriptImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPScriptImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPScriptletImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPScriptletImpl.java
index f63792dce..f63792dce 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPScriptletImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPScriptletImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPStdActionImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPStdActionImpl.java
index eee1c5dce..eee1c5dce 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPStdActionImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPStdActionImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPTagLibImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPTagLibImpl.java
index b0133e262..b0133e262 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JSPTagLibImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JSPTagLibImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JavaScriptImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JavaScriptImpl.java
index 87105c836..87105c836 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JavaScriptImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JavaScriptImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JspFactoryImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JspFactoryImpl.java
index f59a8b46a..f59a8b46a 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JspFactoryImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JspFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JspPackageImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JspPackageImpl.java
index 9564c4234..9564c4234 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/JspPackageImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/JspPackageImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/ModelImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/ModelImpl.java
index 0dc8ba8db..0dc8ba8db 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/ModelImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/ModelImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/PageImpl.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/PageImpl.java
index 8cb263134..8cb263134 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/impl/PageImpl.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/impl/PageImpl.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/util/JspAdapterFactory.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/util/JspAdapterFactory.java
index 5c1896a11..5c1896a11 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/util/JspAdapterFactory.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/util/JspAdapterFactory.java
diff --git a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/util/JspSwitch.java b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/util/JspSwitch.java
index 5fb39abe5..5fb39abe5 100644
--- a/org.eclipse.modisco.jee.jsp/src/org/eclipse/modisco/jee/jsp/util/JspSwitch.java
+++ b/org.eclipse.modisco.jee.jsp/src-gen/org/eclipse/modisco/jee/jsp/util/JspSwitch.java
diff --git a/org.eclipse.modisco.jee.queries.tests/.checkstyle b/org.eclipse.modisco.jee.queries.tests/.checkstyle
index 76d3f9035..e69aca1c1 100644
--- a/org.eclipse.modisco.jee.queries.tests/.checkstyle
+++ b/org.eclipse.modisco.jee.queries.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JUnitPlugin.java b/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JUnitPlugin.java
index 7c17da627..91a2bfe82 100644
--- a/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JUnitPlugin.java
+++ b/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JUnitPlugin.java
@@ -33,7 +33,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -46,7 +46,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -59,7 +59,7 @@ public class JUnitPlugin extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JUnitPlugin getDefault() {

diff --git a/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeEjbAnnotationsTests.java b/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeEjbAnnotationsTests.java
index add7072e3..72c129336 100644
--- a/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeEjbAnnotationsTests.java
+++ b/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeEjbAnnotationsTests.java
@@ -58,10 +58,10 @@ public class JeeEjbAnnotationsTests {
 

 		ModelQuery queryIsInit = querySet.getQuery("IsInit"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsInit);

-		

+

 		ModelQuery queryIsApplicationException = querySet.getQuery("IsApplicationException"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsApplicationException);

-		

+

 		ModelQuery queryIsMessageDriven = querySet.getQuery("IsMessageDriven"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsMessageDriven);

 

diff --git a/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeServletAnnotations.java b/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeServletAnnotations.java
index fedbfefaf..874ba1ef3 100644
--- a/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeServletAnnotations.java
+++ b/org.eclipse.modisco.jee.queries.tests/src/org/eclipse/modisco/jee/queries/tests/JeeServletAnnotations.java
@@ -42,24 +42,24 @@ public class JeeServletAnnotations {
 		// Retrieving some the queries for further testing

 		ModelQuery queryIsMultipartConfig = querySet.getQuery("IsMultipartConfig"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsMultipartConfig);

-		

+

 		// Retrieving some the queries for further testing

 		ModelQuery queryIsWebFilter = querySet.getQuery("IsWebFilter"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsWebFilter);

-		

+

 		// Retrieving some the queries for further testing

 		ModelQuery queryIsWebInitParam = querySet.getQuery("IsWebInitParam"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsWebInitParam);

-		

+

 		// Retrieving some the queries for further testing

 		ModelQuery queryIsWebListener = querySet.getQuery("IsWebListener"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsWebListener);

-		

+

 		// Retrieving some the queries for further testing

 		ModelQuery queryIsWebServlet = querySet.getQuery("IsWebServlet"); //$NON-NLS-1$

 		Assert.assertNotNull(queryIsWebServlet);

-		

-		

+

+

 

 		URI modelUri = URI

 				.createURI("platform:/plugin/org.eclipse.modisco.jee.queries.tests/resources/AnnotationServlet.javaxmi"); //$NON-NLS-1$

@@ -72,7 +72,7 @@ public class JeeServletAnnotations {
 

 			AbstractModelQuery modelQueryImpl;

 			Boolean result;

-			

+

 			if (eObject instanceof ClassDeclaration) {

 				ClassDeclaration classDecl = (ClassDeclaration) eObject;

 				if (classDecl.getName() != null) {

@@ -132,10 +132,10 @@ public class JeeServletAnnotations {
 						result = (Boolean) modelQueryImpl

 								.basicEvaluate(classDecl);

 						Assert.assertTrue(result);

-					} 

+					}

 				}

 			}

 		}

-		

+

 	}

 }

diff --git a/org.eclipse.modisco.jee.queries/.checkstyle b/org.eclipse.modisco.jee.queries/.checkstyle
index 76d3f9035..e69aca1c1 100644
--- a/org.eclipse.modisco.jee.queries/.checkstyle
+++ b/org.eclipse.modisco.jee.queries/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/JEEQueriesActivator.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/JEEQueriesActivator.java
index 3afac8921..fd8960108 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/JEEQueriesActivator.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/JEEQueriesActivator.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries;

@@ -34,7 +34,7 @@ public class JEEQueriesActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -47,7 +47,7 @@ public class JEEQueriesActivator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -60,7 +60,7 @@ public class JEEQueriesActivator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JEEQueriesActivator getDefault() {

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsApplicationException.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsApplicationException.java
index faa3338cc..4668a4dae 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsApplicationException.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsApplicationException.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -29,13 +29,13 @@ public class IsApplicationException implements
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		if (EvaluateAnnotation.evaluate(context,

 				IsApplicationException.ANNOTATION_NAME)

 				.equals(Boolean.TRUE)) {

 			return Boolean.TRUE;

 		}

-		

+

 		IsApplicationException.ANNOTATION_CLASS_NAME.add("EJBException"); //$NON-NLS-1$

 		IsApplicationException.ANNOTATION_CLASS_NAME.add("EJBCreateException"); //$NON-NLS-1$

 		IsApplicationException.ANNOTATION_CLASS_NAME.add("RemoveException"); //$NON-NLS-1$

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsAroundInvoke.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsAroundInvoke.java
index 5bae0df1e..4e99e8e6f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsAroundInvoke.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsAroundInvoke.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsAroundInvoke implements IJavaModelQuery<MethodDeclaration, Boolea
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsAroundInvoke.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDeclareRoles.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDeclareRoles.java
index cbb3c85d2..f20c3cb89 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDeclareRoles.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDeclareRoles.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsDeclareRoles implements IJavaModelQuery<ClassDeclaration, Boolean
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsDeclareRoles.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDenyAll.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDenyAll.java
index e30e68579..7b8c21b41 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDenyAll.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsDenyAll.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsDenyAll implements IJavaModelQuery<MethodDeclaration, Boolean> {
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsDenyAll.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJB.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJB.java
index efe1c4c30..035da32f9 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJB.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJB.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsEJB implements IJavaModelQuery<BodyDeclaration, Boolean> {
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsEJB.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJBs.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJBs.java
index 3437e2a22..bb77fd92f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJBs.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsEJBs.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsEJBs implements IJavaModelQuery<ClassDeclaration, Boolean> {
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsEJBs.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsExcludeClassInterceptors.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsExcludeClassInterceptors.java
index faa287b33..933c111c6 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsExcludeClassInterceptors.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsExcludeClassInterceptors.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsExcludeClassInterceptors implements IJavaModelQuery<BodyDeclarati
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsExcludeClassInterceptors.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInit.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInit.java
index 09c129468..0a68d0996 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInit.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInit.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsInit implements IJavaModelQuery<MethodDeclaration, Boolean> {
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsInit.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInterceptors.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInterceptors.java
index a829d3d13..a05bf2a91 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInterceptors.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsInterceptors.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsInterceptors implements IJavaModelQuery<BodyDeclaration, Boolean>
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsInterceptors.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocal.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocal.java
index d6d73af13..e3744d4f4 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocal.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocal.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsLocal implements IJavaModelQuery<ClassDeclaration, Boolean> {
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsLocal.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocalHome.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocalHome.java
index 473d28b9e..890c9f3da 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocalHome.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsLocalHome.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsMessageDriven.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsMessageDriven.java
index 34e5aaf6c..06ba8ba2a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsMessageDriven.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsMessageDriven.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPermitAll.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPermitAll.java
index 644f906fc..a391e1d82 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPermitAll.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPermitAll.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsPermitAll implements IJavaModelQuery<BodyDeclaration, Boolean> {
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsPermitAll.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostActivate.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostActivate.java
index 4661ad593..10b5e0157 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostActivate.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostActivate.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsPostActivate implements IJavaModelQuery<MethodDeclaration, Boolea
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsPostActivate.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostConstruct.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostConstruct.java
index 350c6aeca..e6ff2323a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostConstruct.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPostConstruct.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsPostConstruct implements IJavaModelQuery<MethodDeclaration, Boole
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsPostConstruct.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPreDestroy.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPreDestroy.java
index cc8a98df1..d5ae255b4 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPreDestroy.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPreDestroy.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsPreDestroy implements IJavaModelQuery<MethodDeclaration, Boolean>
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsPreDestroy.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPrePassivate.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPrePassivate.java
index cbd90c208..b835a17ea 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPrePassivate.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsPrePassivate.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsPrePassivate implements IJavaModelQuery<MethodDeclaration, Boolea
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsPrePassivate.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemote.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemote.java
index ab63edb3f..ae69b3a82 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemote.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemote.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemoteHome.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemoteHome.java
index b66d2dd7d..ab4075e8a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemoteHome.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemoteHome.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemove.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemove.java
index f5aa0208d..7af9bdb05 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemove.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRemove.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsRemove implements IJavaModelQuery<MethodDeclaration, Boolean> {
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsRemove.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResource.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResource.java
index 9d5383e37..9f95dfe8c 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResource.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResource.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsResource implements IJavaModelQuery<BodyDeclaration, Boolean> {
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsResource.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResources.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResources.java
index 1380c7daf..bebf3e26f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResources.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsResources.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsResources implements IJavaModelQuery<ClassDeclaration, Boolean> {
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsResources.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRolesAllowed.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRolesAllowed.java
index 54bc748cf..4257837ba 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRolesAllowed.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRolesAllowed.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */package org.eclipse.modisco.jee.queries.annotations.ejb;

 

@@ -23,7 +23,7 @@ public class IsRolesAllowed implements IJavaModelQuery<BodyDeclaration, Boolean>
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsRolesAllowed.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRunAs.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRunAs.java
index f82c6cab4..6a69fb56f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRunAs.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsRunAs.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */package org.eclipse.modisco.jee.queries.annotations.ejb;

 

@@ -23,7 +23,7 @@ public class IsRunAs implements IJavaModelQuery<ClassDeclaration, Boolean> {
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsRunAs.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateful.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateful.java
index bcacb1156..d7b2bde09 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateful.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateful.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateless.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateless.java
index aac483323..f057817d0 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateless.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsStateless.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTimeout.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTimeout.java
index e128ec333..55702897e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTimeout.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTimeout.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsTimeout implements IJavaModelQuery<MethodDeclaration, Boolean> {
 	public Boolean evaluate(final MethodDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsTimeout.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionAttribute.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionAttribute.java
index 21c96eabc..38eb5902d 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionAttribute.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionAttribute.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsTransactionAttribute implements IJavaModelQuery<BodyDeclaration,
 	public Boolean evaluate(final BodyDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsTransactionAttribute.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionManagement.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionManagement.java
index 81227ed6b..04e8c2c8b 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionManagement.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/ejb/IsTransactionManagement.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.ejb;

@@ -24,7 +24,7 @@ public class IsTransactionManagement implements IJavaModelQuery<ClassDeclaration
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsTransactionManagement.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/EvaluateAnnotation.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/EvaluateAnnotation.java
index f45cd5949..a2bf399d0 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/EvaluateAnnotation.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/EvaluateAnnotation.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/ResolveInheritance.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/ResolveInheritance.java
index 4e97367c1..57e487073 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/ResolveInheritance.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/internal/ResolveInheritance.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAccess.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAccess.java
index a288f402a..4ceba2e17 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAccess.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAccess.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
@@ -28,14 +28,14 @@ public class IsAccess implements IJavaModelQuery<BodyDeclaration, Boolean> {
 
 		return EvaluateAnnotation.evaluate(context,
 				IsAccess.ANNOTATION_NAME);
-		
+
 //        if (EvaluateAnnotation.evaluateAnnotation(context,
 //				parameterValues, IsAccess.ANNOTATION_NAME).equals(Boolean.TRUE)) {
 //        	return Boolean.TRUE;
-//        } 
+//        }
 //       return false;
        // return new ResolveInheritance().evaluateAnnotation(context, parameterValues, IsAccess.ANNOTATION_CLASS_EQUIVALENCE);
-        
+
 	}
 
 }
\ No newline at end of file
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverride.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverride.java
index 205c5478b..f14910f2f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverride.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverride.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverrides.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverrides.java
index dac00cd3a..afd0f2401 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverrides.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAssociationOverrides.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverride.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverride.java
index 7f7429663..f43535db6 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverride.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverride.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverrides.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverrides.java
index 27e46e411..2c114eeb5 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverrides.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsAttributeOverrides.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsBasic.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsBasic.java
index 83c92acfa..8161f5bfc 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsBasic.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsBasic.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCacheable.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCacheable.java
index b5a711d51..6c4abc294 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCacheable.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCacheable.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCollectionTable.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCollectionTable.java
index 5feb7d4ac..f079c15f9 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCollectionTable.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsCollectionTable.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumn.java
index 7a8c999fb..9a634e4d8 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumnResult.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumnResult.java
index 30b41dd32..e6eaf45bb 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumnResult.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsColumnResult.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorColumn.java
index a5adbb7b2..71a24bccc 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorValue.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorValue.java
index 9cf08c1ad..f6da2fa07 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorValue.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsDiscriminatorValue.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsElementCollection.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsElementCollection.java
index 4b0e11c25..57926faf4 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsElementCollection.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsElementCollection.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddable.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddable.java
index 62f47ddec..dc20e59e8 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddable.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddable.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbedded.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbedded.java
index f7d3a30f5..e61f7087f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbedded.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbedded.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddedId.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddedId.java
index b7c571a16..ba1a3c53e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddedId.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEmbeddedId.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntity.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntity.java
index 2ba595ebc..0ed465e7b 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntity.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntity.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityListeners.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityListeners.java
index 58c730b33..868294dbe 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityListeners.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityListeners.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityResult.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityResult.java
index 8388779db..a3f8da60a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityResult.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEntityResult.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEnumerated.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEnumerated.java
index 8d1881342..96e6083bf 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEnumerated.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsEnumerated.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeDefaultListeners.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeDefaultListeners.java
index b762b7e80..40ae1bc6a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeDefaultListeners.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeDefaultListeners.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeSuperclassListeners.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeSuperclassListeners.java
index 573b2c11d..41f4b0b83 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeSuperclassListeners.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsExcludeSuperclassListeners.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsFieldResult.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsFieldResult.java
index 86372d0b2..589b5e868 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsFieldResult.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsFieldResult.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsGeneratedValue.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsGeneratedValue.java
index 4058e178c..5875a1e8a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsGeneratedValue.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsGeneratedValue.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsId.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsId.java
index 0e60f1856..dd707681b 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsId.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsId.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsIdClass.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsIdClass.java
index c649badd6..9f2be5ced 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsIdClass.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsIdClass.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsInheritance.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsInheritance.java
index e6bcb3b12..680192a95 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsInheritance.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsInheritance.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumn.java
index 84d18ccfd..24f0fe9d6 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumns.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumns.java
index fc50888d8..c4a21ecfb 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumns.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinColumns.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinTable.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinTable.java
index 9c5628403..0ef9c2ce1 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinTable.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsJoinTable.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsLob.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsLob.java
index bd4fe6c4e..511a7c708 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsLob.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsLob.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToMany.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToMany.java
index 087ec5357..da00a9dcb 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToMany.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToMany.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToOne.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToOne.java
index 56f2c46fd..5d653a01b 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToOne.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsManyToOne.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKey.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKey.java
index 7339ac621..9c989a3ee 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKey.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKey.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyClass.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyClass.java
index 9ae0b43f3..ed312c41e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyClass.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyClass.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyColumn.java
index 4a0e2eff7..f02bfec29 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyEnumerated.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyEnumerated.java
index 65ed9d56e..b853de3cf 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyEnumerated.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyEnumerated.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumn.java
index d88b4e2bb..3d0ee4201 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumns.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumns.java
index f5c7f4cc8..db836b5ab 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumns.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyJoinColumns.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyTemporal.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyTemporal.java
index 90725dc71..4c4156aa4 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyTemporal.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapKeyTemporal.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMappedSuperclass.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMappedSuperclass.java
index f7d12fae9..e88cfb9fa 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMappedSuperclass.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMappedSuperclass.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapsId.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapsId.java
index 0341a00f6..6668e01c5 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapsId.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsMapsId.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQueries.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQueries.java
index ef0b03497..0744bcd37 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQueries.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQueries.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQuery.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQuery.java
index 9445f308c..a38fb5d5f 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQuery.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedNativeQuery.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQueries.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQueries.java
index ead6867aa..f920b453e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQueries.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQueries.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQuery.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQuery.java
index 1e769709b..1d0418c6b 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQuery.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsNamedQuery.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToMany.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToMany.java
index a7983047a..b1fdfde20 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToMany.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToMany.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToOne.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToOne.java
index da36c79fb..471a35d06 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToOne.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOneToOne.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderBy.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderBy.java
index 8fc3841d2..3ec8fe59e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderBy.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderBy.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderColumn.java
index ed1129b62..7260b42f5 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsOrderColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContext.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContext.java
index 1808bcfa1..4cc4800bd 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContext.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContext.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContexts.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContexts.java
index bb7c7b037..db51edcd9 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContexts.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceContexts.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceProperty.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceProperty.java
index d55e701ec..bdf10855e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceProperty.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceProperty.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnit.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnit.java
index 57abbc4ca..3b9afdff1 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnit.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnit.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnits.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnits.java
index e84347285..d264036a0 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnits.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPersistenceUnits.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostLoad.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostLoad.java
index 00e0e7090..78a3e0fd8 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostLoad.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostLoad.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostPersist.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostPersist.java
index 1de5dd621..1391556c1 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostPersist.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostPersist.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostRemove.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostRemove.java
index c99533377..1651b798a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostRemove.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostRemove.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostUpdate.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostUpdate.java
index 1e02e33ab..01530ed72 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostUpdate.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPostUpdate.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrePersist.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrePersist.java
index 2abbe0054..47cff8ca0 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrePersist.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrePersist.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreRemove.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreRemove.java
index 350f600a8..58d346d98 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreRemove.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreRemove.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreUpdate.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreUpdate.java
index ee1aa452c..fa98fdc52 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreUpdate.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPreUpdate.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumn.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumn.java
index e6423e569..9c2d2385e 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumn.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumn.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumns.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumns.java
index bb050d7b0..410fcab54 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumns.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsPrimaryKeyJoinColumns.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsQueryHint.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsQueryHint.java
index ee6dff665..cb76f590a 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsQueryHint.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsQueryHint.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTable.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTable.java
index 6ca14184a..455636c3d 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTable.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTable.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTables.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTables.java
index e847e6e6d..1ee99eab7 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTables.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSecondaryTables.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSequenceGenerator.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSequenceGenerator.java
index 8a0cbdb8f..2c498b0d2 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSequenceGenerator.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSequenceGenerator.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMapping.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMapping.java
index 1aafea902..9ca4f9044 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMapping.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMapping.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMappings.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMappings.java
index 96c15a64f..f6c062ae7 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMappings.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsSqlResultSetMappings.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTable.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTable.java
index cb0053e2a..ae11e7793 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTable.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTable.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTableGenerator.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTableGenerator.java
index 2b474836b..c5eda33f5 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTableGenerator.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTableGenerator.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTemporal.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTemporal.java
index d0518aef9..1a79ada34 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTemporal.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTemporal.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTransient.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTransient.java
index d506a3de8..5e3b70ce2 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTransient.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsTransient.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsUniqueConstraint.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsUniqueConstraint.java
index e0a93d2ac..e497e7767 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsUniqueConstraint.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsUniqueConstraint.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsVersion.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsVersion.java
index 0dd1e54d0..67a73cdb3 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsVersion.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/jpa/IsVersion.java
@@ -4,9 +4,9 @@
  *  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:
- *  
+ *
  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation
  */
 package org.eclipse.modisco.jee.queries.annotations.jpa;
diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsMultipartConfig.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsMultipartConfig.java
index 9d9bb0f10..e6ffcc9be 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsMultipartConfig.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsMultipartConfig.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.servlet;

@@ -24,7 +24,7 @@ public class IsMultipartConfig implements IJavaModelQuery<ClassDeclaration, Bool
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsMultipartConfig.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebFilter.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebFilter.java
index 7f8dbe65b..ac452ea0b 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebFilter.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebFilter.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.servlet;

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebInitParam.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebInitParam.java
index 7d942a209..5d79ce28c 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebInitParam.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebInitParam.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.servlet;

@@ -24,7 +24,7 @@ public class IsWebInitParam implements IJavaModelQuery<ClassDeclaration, Boolean
 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		return EvaluateAnnotation.evaluate(context,

 				IsWebInitParam.ANNOTATION_NAME);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebListener.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebListener.java
index 879744d28..9bb481531 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebListener.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebListener.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.servlet;

@@ -24,11 +24,11 @@ public class IsWebListener implements IJavaModelQuery<ClassDeclaration, Boolean>
 

 	static final String ANNOTATION_NAME = "WebListener"; //$NON-NLS-1$

 	private ArrayList<String> annotationClassName = null;

-	

+

 	public Boolean evaluate(final ClassDeclaration context,

 			final ParameterValueList parameterValues)

 			throws ModelQueryExecutionException {

-		

+

 		if (EvaluateAnnotation.evaluate(context,

 				IsWebListener.ANNOTATION_NAME).equals(

 				Boolean.TRUE)) {

@@ -41,7 +41,7 @@ public class IsWebListener implements IJavaModelQuery<ClassDeclaration, Boolean>
 		this.annotationClassName.add("ServletRequestAttributeListener"); //$NON-NLS-1$

 		this.annotationClassName.add("HttpSessionListener"); //$NON-NLS-1$

 		this.annotationClassName.add("HttpSessionAttributeListener"); //$NON-NLS-1$

-		

+

 		return new ResolveInheritance().evaluate(context,

 				this.annotationClassName);

 	}

diff --git a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebServlet.java b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebServlet.java
index 4f7757554..12c0ee9cf 100644
--- a/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebServlet.java
+++ b/org.eclipse.modisco.jee.queries/src/org/eclipse/modisco/jee/queries/annotations/servlet/IsWebServlet.java
@@ -4,9 +4,9 @@
  *  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:

- *  

+ *

  *  	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  */

 package org.eclipse.modisco.jee.queries.annotations.servlet;

@@ -38,7 +38,7 @@ public class IsWebServlet implements IJavaModelQuery<ClassDeclaration, Boolean>
 		this.annotationClassName.add("HttpServlet"); //$NON-NLS-1$

 		this.annotationClassName.add("GenericServlet"); //$NON-NLS-1$

 		this.annotationClassName.add("Servlet"); //$NON-NLS-1$

-		

+

 		return new ResolveInheritance().evaluate(context,

 				this.annotationClassName);

 	}

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/.checkstyle b/org.eclipse.modisco.jee.webapp.discoverer.tests/.checkstyle
index 9e378825c..690d2b413 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/.checkstyle
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/.checkstyle
@@ -1,5 +1,5 @@
  <fileset-config file-format-version="1.2.0" simple-config="true">

-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

      <file-match-pattern match-pattern="." include-pattern="true"/>

      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/JUnitPlugin.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/JUnitPlugin.java
index 25f6c7256..f556abbf0 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/JUnitPlugin.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/JUnitPlugin.java
@@ -5,11 +5,11 @@
  * 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:

- * 

+ *

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

- *          

+ *

  * *******************************************************************************

  *

  */

@@ -38,7 +38,7 @@ public class JUnitPlugin extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)

 	 */

@@ -50,7 +50,7 @@ public class JUnitPlugin extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)

 	 */

@@ -62,7 +62,7 @@ public class JUnitPlugin extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static JUnitPlugin getDefault() {

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestCommentedDocType.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestCommentedDocType.java
index bfdeadca2..79f465e73 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestCommentedDocType.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestCommentedDocType.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -28,7 +28,7 @@ import org.junit.Test;
 /**

  * Test of discovering a WEB.XML model 2.4 The specified file does not contain a

  * declaration of xsd, only the version

- * 

+ *

  */

 public class TestCommentedDocType {

 

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestNoVersion.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestNoVersion.java
index c9d271900..319b4f683 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestNoVersion.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestNoVersion.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml22.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml22.java
index d0cf6fe9c..5827a2964 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml22.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml22.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -36,7 +36,7 @@ import org.junit.Test;
 

 /**

  * Test of discovering a WEB.XML model 2.2

- * 

+ *

  */

 public class TestWebXml22 {

 

@@ -134,7 +134,7 @@ public class TestWebXml22 {
 			Assert.assertTrue(errorPage.getExceptionType().getMixed().get(0).getValue().toString()

 					.equalsIgnoreCase("exception-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(errorPage.getLocation().getMixed().get(0).getValue().toString()

-					.equalsIgnoreCase("location-example")); //$NON-NLS-1$				

+					.equalsIgnoreCase("location-example")); //$NON-NLS-1$

 

 			// <!-- TEST Modisco security-constraint-->

 			SecurityConstraintType secu = webApp.getSecurityConstraint().get(0);

@@ -146,7 +146,7 @@ public class TestWebXml22 {
 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getUrlPattern().get(0)

 					.getMixed().getValue(0).toString().equalsIgnoreCase("url-pattern-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getHttpMethod().get(0)

-					.getMixed().getValue(0).toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$			

+					.getMixed().getValue(0).toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getDescription().getMixed().get(0)

 					.getValue().toString().equalsIgnoreCase("description-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getRoleName().get(0).getMixed().get(0)

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml23.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml23.java
index dc4015de1..23b2e89c1 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml23.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml23.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -36,11 +36,11 @@ import org.junit.Test;
 

 /**

  * Test of discovering a WEB.XML model 2.3

- * 

+ *

  */

 public class TestWebXml23 {

 

-	private static final String RESOURCES_TEST_XML = "/resources/TestWebXml23.xml"; //$NON-NLS-1$	

+	private static final String RESOURCES_TEST_XML = "/resources/TestWebXml23.xml"; //$NON-NLS-1$

 	private static final String VERSION = "2.3"; //$NON-NLS-1$

 	private Resource resource;

 

@@ -133,7 +133,7 @@ public class TestWebXml23 {
 			Assert.assertTrue(errorPage.getExceptionType().getMixed().get(0).getValue().toString()

 					.equalsIgnoreCase("exception-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(errorPage.getLocation().getMixed().get(0).getValue().toString()

-					.equalsIgnoreCase("location-example")); //$NON-NLS-1$				

+					.equalsIgnoreCase("location-example")); //$NON-NLS-1$

 

 			// <!-- TEST Modisco security-constraint-->

 			SecurityConstraintType secu = webApp.getSecurityConstraint().get(0);

@@ -145,7 +145,7 @@ public class TestWebXml23 {
 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getUrlPattern().get(0)

 					.getMixed().getValue(0).toString().equalsIgnoreCase("url-pattern-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getHttpMethod().get(0)

-					.getMixed().getValue(0).toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$			

+					.getMixed().getValue(0).toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getDescription().getMixed().get(0)

 					.getValue().toString().equalsIgnoreCase("description-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getRoleName().get(0).getMixed().get(0)

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml24.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml24.java
index 674c1bac0..bb274d77d 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml24.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml24.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -36,12 +36,12 @@ import org.junit.Test;
 

 /**

  * Test of discovering a WEB.XML model 2.4

- * 

+ *

  */

 public class TestWebXml24 {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestWebXml24.xml"; //$NON-NLS-1$

-	private static final String VERSION = "2.4"; //$NON-NLS-1$	

+	private static final String VERSION = "2.4"; //$NON-NLS-1$

 	private Resource resource;

 

 	@Before

@@ -132,7 +132,7 @@ public class TestWebXml24 {
 			Assert.assertTrue(errorPage.getExceptionType().getValue().toString()

 					.equalsIgnoreCase("exception-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(errorPage.getLocation().getValue().toString()

-					.equalsIgnoreCase("location-example")); //$NON-NLS-1$				

+					.equalsIgnoreCase("location-example")); //$NON-NLS-1$

 

 			// <!-- TEST Modisco security-constraint-->

 			SecurityConstraintType secu = webApp.getSecurityConstraint().get(0);

@@ -143,7 +143,7 @@ public class TestWebXml24 {
 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getUrlPattern().get(0)

 					.getValue().toString().equalsIgnoreCase("url-pattern-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getHttpMethod().get(0)

-					.getValue().toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$			

+					.getValue().toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getDescription().get(0).getValue()

 					.toString().equalsIgnoreCase("description-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getRoleName().get(0).getValue().toString()

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml25.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml25.java
index 34143c3c5..5a59f4d10 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml25.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml25.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -36,7 +36,7 @@ import org.junit.Test;
 

 /**

  * Test of discovering a WEB.XML model 2.5

- * 

+ *

  */

 public class TestWebXml25 {

 

@@ -132,7 +132,7 @@ public class TestWebXml25 {
 			Assert.assertTrue(errorPage.getExceptionType().getValue().toString()

 					.equalsIgnoreCase("exception-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(errorPage.getLocation().getValue().toString()

-					.equalsIgnoreCase("location-example")); //$NON-NLS-1$				

+					.equalsIgnoreCase("location-example")); //$NON-NLS-1$

 

 			// <!-- TEST Modisco security-constraint-->

 			SecurityConstraintType secu = webApp.getSecurityConstraint().get(0);

@@ -143,7 +143,7 @@ public class TestWebXml25 {
 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getUrlPattern().get(0)

 					.getValue().toString().equalsIgnoreCase("url-pattern-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getHttpMethod().get(0)

-					.toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$			

+					.toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getDescription().get(0).getValue()

 					.toString().equalsIgnoreCase("description-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getRoleName().get(0).getValue().toString()

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml30.java b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml30.java
index d759fb31b..924f83281 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml30.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/src/org/eclipse/modisco/jee/webapp/discoverer/tests/TestWebXml30.java
@@ -4,7 +4,7 @@
  * 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:

  *   Nicolas Guyomar (Mia-Software) - initial API and implementation

  *   Nicolas Bros (Mia-Software) - adapted to new discovery framework

@@ -36,12 +36,12 @@ import org.junit.Test;
 

 /**

  * Test of discovering a WEB.XML model 3.0

- * 

+ *

  */

 public class TestWebXml30 {

 

 	private static final String RESOURCES_TEST1_XML = "/resources/TestWebXml30.xml"; //$NON-NLS-1$

-	private static final String VERSION = "3.0"; //$NON-NLS-1$	

+	private static final String VERSION = "3.0"; //$NON-NLS-1$

 	private Resource resource;

 

 	@Before

@@ -132,7 +132,7 @@ public class TestWebXml30 {
 			Assert.assertTrue(errorPage.getExceptionType().getValue().toString()

 					.equalsIgnoreCase("exception-type-example")); //$NON-NLS-1$

 			Assert.assertTrue(errorPage.getLocation().getValue().toString()

-					.equalsIgnoreCase("location-example")); //$NON-NLS-1$				

+					.equalsIgnoreCase("location-example")); //$NON-NLS-1$

 

 			// <!-- TEST Modisco security-constraint-->

 			SecurityConstraintType secu = webApp.getSecurityConstraint().get(0);

@@ -143,7 +143,7 @@ public class TestWebXml30 {
 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getUrlPattern().get(0)

 					.getValue().toString().equalsIgnoreCase("url-pattern-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getWebResourceCollection().get(0).getHttpMethod().get(0)

-					.toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$			

+					.toString().equalsIgnoreCase("http-method-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getDescription().get(0).getValue()

 					.toString().equalsIgnoreCase("description-example")); //$NON-NLS-1$

 			Assert.assertTrue(secu.getAuthConstraint().getRoleName().get(0).getValue().toString()

diff --git a/org.eclipse.modisco.jee.webapp.discoverer.ui/.checkstyle b/org.eclipse.modisco.jee.webapp.discoverer.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.jee.webapp.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.ui/src/org/eclipse/modisco/jee/webapp/discoverer/ui/Activator.java b/org.eclipse.modisco.jee.webapp.discoverer.ui/src/org/eclipse/modisco/jee/webapp/discoverer/ui/Activator.java
index 9061253f9..0424454af 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.ui/src/org/eclipse/modisco/jee/webapp/discoverer/ui/Activator.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer.ui/src/org/eclipse/modisco/jee/webapp/discoverer/ui/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.jee.webapp.discoverer/.checkstyle b/org.eclipse.modisco.jee.webapp.discoverer/.checkstyle
index 9e378825c..690d2b413 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer/.checkstyle
+++ b/org.eclipse.modisco.jee.webapp.discoverer/.checkstyle
@@ -1,5 +1,5 @@
  <fileset-config file-format-version="1.2.0" simple-config="true">

-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

      <file-match-pattern match-pattern="." include-pattern="true"/>

      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/WebXmlActivator.java b/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/WebXmlActivator.java
index c6b6a526c..d71722483 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/WebXmlActivator.java
+++ b/org.eclipse.modisco.jee.webapp.discoverer/src/org/eclipse/modisco/jee/webapp/discoverer/WebXmlActivator.java
@@ -5,11 +5,11 @@
  * 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:

- * 

+ *

  *     Nicolas Guyomar (Mia-Software) - initial API and implementation

- *          

+ *

  * *******************************************************************************

  *

  */

@@ -28,7 +28,7 @@ public class WebXmlActivator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static WebXmlActivator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.jee.webapp/.checkstyle b/org.eclipse.modisco.jee.webapp/.checkstyle
index 5e1176c5f..a8c9dd0f6 100644
--- a/org.eclipse.modisco.jee.webapp/.checkstyle
+++ b/org.eclipse.modisco.jee.webapp/.checkstyle
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/jee/webapp/webapp22"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/jee/webapp/webapp23"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/jee/webapp/webapp24"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/jee/webapp/webapp25"/>
-    <filter-data value="src/org/eclipse/gmt/modisco/jee/webapp/webapp30"/>
-    <filter-data value="src/org/eclipse/modisco/jee/webapp/webapp22"/>
-    <filter-data value="src/org/eclipse/modisco/jee/webapp/webapp23"/>
-    <filter-data value="src/org/eclipse/modisco/jee/webapp/webapp24"/>
-    <filter-data value="src/org/eclipse/modisco/jee/webapp/webapp25"/>
-    <filter-data value="src/org/eclipse/modisco/jee/webapp/webapp30"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.jee.webapp/.classpath b/org.eclipse.modisco.jee.webapp/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.jee.webapp/.classpath
+++ b/org.eclipse.modisco.jee.webapp/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.jee.webapp/build.properties b/org.eclipse.modisco.jee.webapp/build.properties
index 27423fd3b..9090e33a0 100644
--- a/org.eclipse.modisco.jee.webapp/build.properties
+++ b/org.eclipse.modisco.jee.webapp/build.properties
@@ -1,5 +1,5 @@
 # <copyright>

-#Copyright (c) 2010 Mia-Software.

+#Copyright (c) 2010, 2018 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

@@ -7,6 +7,7 @@
 #

 #Contributors:

 #    Nicolas Guyomar (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # </copyright>

 #

 # $Id$

@@ -19,6 +20,6 @@ bin.includes = .,\
                about.html,\

                resources/

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.jee.webapp/model/webapp22.genmodel b/org.eclipse.modisco.jee.webapp/model/webapp22.genmodel
index 78cdf01ca..d318eaaa8 100644
--- a/org.eclipse.modisco.jee.webapp/model/webapp22.genmodel
+++ b/org.eclipse.modisco.jee.webapp/model/webapp22.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

- -->

+ *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

+  -->

 <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="  Copyright (c) 2010 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.webapp/src" modelPluginID="org.eclipse.modisco.jee.webapp"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="  Copyright (c) 2010, 2018 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.webapp/src-gen" modelPluginID="org.eclipse.modisco.jee.webapp"

     modelName="Webapp22" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false">

   <foreignModel>webapp22.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.webapp/model/webapp23.genmodel b/org.eclipse.modisco.jee.webapp/model/webapp23.genmodel
index 0a1636183..9767a85f7 100644
--- a/org.eclipse.modisco.jee.webapp/model/webapp23.genmodel
+++ b/org.eclipse.modisco.jee.webapp/model/webapp23.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+ *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="  Copyright (c) 2010 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.webapp/src" modelPluginID="org.eclipse.modisco.jee.webapp"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="  Copyright (c) 2010, 2018 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.webapp/src-gen" modelPluginID="org.eclipse.modisco.jee.webapp"

     modelName="Webapp23" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false">

   <foreignModel>webapp23.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.webapp/model/webapp24.genmodel b/org.eclipse.modisco.jee.webapp/model/webapp24.genmodel
index 18611aa86..404df6e0c 100644
--- a/org.eclipse.modisco.jee.webapp/model/webapp24.genmodel
+++ b/org.eclipse.modisco.jee.webapp/model/webapp24.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+ *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="  Copyright (c) 2010 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.webapp/src" modelPluginID="org.eclipse.modisco.jee.webapp"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="  Copyright (c) 2010, 2018 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.webapp/src-gen" modelPluginID="org.eclipse.modisco.jee.webapp"

     modelName="Webapp24" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">

   <foreignModel>webapp24.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.webapp/model/webapp25.genmodel b/org.eclipse.modisco.jee.webapp/model/webapp25.genmodel
index 2b19ce028..61aff5257 100644
--- a/org.eclipse.modisco.jee.webapp/model/webapp25.genmodel
+++ b/org.eclipse.modisco.jee.webapp/model/webapp25.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+ *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="  Copyright (c) 2010 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.webapp/src" modelPluginID="org.eclipse.modisco.jee.webapp"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="  Copyright (c) 2010, 2018 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.webapp/src-gen" modelPluginID="org.eclipse.modisco.jee.webapp"

     modelName="Webapp25" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">

   <foreignModel>webapp25.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.webapp/model/webapp30.genmodel b/org.eclipse.modisco.jee.webapp/model/webapp30.genmodel
index e93f06234..72e2970fa 100644
--- a/org.eclipse.modisco.jee.webapp/model/webapp30.genmodel
+++ b/org.eclipse.modisco.jee.webapp/model/webapp30.genmodel
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <!-- 

- *  Copyright (c) 2010 Mia-Software.

+ *  Copyright (c) 2010, 2018 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

@@ -9,11 +9,12 @@
  *  Contributors:

  *  

  *      Nicolas Guyomar (Mia-Software) - initial API and implementation

+ *	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

  -->

 <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="  Copyright (c) 2010 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.jee.webapp/src" modelPluginID="org.eclipse.modisco.jee.webapp"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="  Copyright (c) 2010, 2018 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;      Nicolas Guyomar (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.jee.webapp/src-gen" modelPluginID="org.eclipse.modisco.jee.webapp"

     modelName="Webapp30" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" runtimeVersion="2.5" usedGenPackages="platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace">

   <foreignModel>webapp30.ecore</foreignModel>

diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/AuthConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/AuthConstraintType.java
index 7b70728fb..7b70728fb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/AuthConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/AuthConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/AuthMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/AuthMethodType.java
index 9da55d115..9da55d115 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/AuthMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/AuthMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ContextParamType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ContextParamType.java
index 69104c0ff..69104c0ff 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ContextParamType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ContextParamType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DescriptionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DescriptionType.java
index dd36b4895..dd36b4895 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DescriptionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DisplayNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DisplayNameType.java
index d5fb79037..d5fb79037 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DistributableType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DistributableType.java
index 27bfca2cb..27bfca2cb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DistributableType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DistributableType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DocumentRoot.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DocumentRoot.java
index ed16d4475..ed16d4475 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbLinkType.java
index 690d69d1d..690d69d1d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbRefNameType.java
index 6d65406f2..6d65406f2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbRefType.java
index 93c3e070a..93c3e070a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbRefTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbRefTypeType.java
index fc87161e2..fc87161e2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryNameType.java
index 614acad88..614acad88 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryType.java
index 0fe4fa684..0fe4fa684 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryTypeType.java
index b7117c0b7..b7117c0b7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryValueType.java
index b4bb219fe..b4bb219fe 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/EnvEntryValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ErrorCodeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ErrorCodeType.java
index 4763c14d6..4763c14d6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ErrorCodeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ErrorCodeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ErrorPageType.java
index 6c32fd4bf..6c32fd4bf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ExceptionTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ExceptionTypeType.java
index e9afc3095..e9afc3095 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ExceptionTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ExceptionTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ExtensionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ExtensionType.java
index 75d8b274c..75d8b274c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ExtensionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ExtensionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/FormErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/FormErrorPageType.java
index d47a4af7c..d47a4af7c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/FormErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/FormErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/FormLoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/FormLoginConfigType.java
index 0b72db303..0b72db303 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/FormLoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/FormLoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/FormLoginPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/FormLoginPageType.java
index 067ef2521..067ef2521 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/FormLoginPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/FormLoginPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/HomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/HomeType.java
index 52961c4bc..52961c4bc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/HomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/HomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/HttpMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/HttpMethodType.java
index dca81803e..dca81803e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/HttpMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/HttpMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/IconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/IconType.java
index 7a87957da..7a87957da 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/IconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/IconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/InitParamType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/InitParamType.java
index 93122dad9..93122dad9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/InitParamType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/InitParamType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/JspFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/JspFileType.java
index 9f2dd3074..9f2dd3074 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/JspFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/JspFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LargeIconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LargeIconType.java
index 9b3709b32..9b3709b32 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LargeIconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LargeIconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LoadOnStartupType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LoadOnStartupType.java
index 33020120d..33020120d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LoadOnStartupType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LoadOnStartupType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LocationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LocationType.java
index f6fcd307a..f6fcd307a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LocationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LocationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LoginConfigType.java
index c582d4673..c582d4673 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/LoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/LoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/MimeMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/MimeMappingType.java
index 334d95e5e..334d95e5e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/MimeMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/MimeMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/MimeTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/MimeTypeType.java
index 797a9c106..797a9c106 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/MimeTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/MimeTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ParamNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ParamNameType.java
index 07e56bd41..07e56bd41 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ParamNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ParamNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ParamValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ParamValueType.java
index 5069bc421..5069bc421 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ParamValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RealmNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RealmNameType.java
index cb7c61c0c..cb7c61c0c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RealmNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RealmNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RemoteType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RemoteType.java
index 587a81892..587a81892 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RemoteType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RemoteType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResAuthType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResAuthType.java
index dee948c83..dee948c83 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResAuthType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResRefNameType.java
index 7f4e3a516..7f4e3a516 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResTypeType.java
index cbdfd38c1..cbdfd38c1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResourceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResourceRefType.java
index ed138e83c..ed138e83c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RoleLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RoleLinkType.java
index 694334957..694334957 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RoleLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RoleLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RoleNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RoleNameType.java
index c021db5bf..c021db5bf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/RoleNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SecurityConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SecurityConstraintType.java
index 79f88fd1e..79f88fd1e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SecurityConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SecurityConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleRefType.java
index 75799bae9..75799bae9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleType.java
index fad09f715..fad09f715 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletClassType.java
index f1dd0f353..f1dd0f353 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletMappingType.java
index 9677ae464..9677ae464 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletNameType.java
index 0d1eee605..0d1eee605 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletType.java
index 16ea841d9..16ea841d9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/ServletType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/ServletType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SessionConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SessionConfigType.java
index 9f24887d8..9f24887d8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SessionConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SessionConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SessionTimeoutType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SessionTimeoutType.java
index 8bb63ad34..8bb63ad34 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SessionTimeoutType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SessionTimeoutType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SmallIconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SmallIconType.java
index 222c5f240..222c5f240 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/SmallIconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/SmallIconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TaglibLocationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TaglibLocationType.java
index 23a0d6c7d..23a0d6c7d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TaglibLocationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TaglibLocationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TaglibType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TaglibType.java
index 6ec45abfa..6ec45abfa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TaglibType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TaglibType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TaglibUriType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TaglibUriType.java
index 46f44f49c..46f44f49c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TaglibUriType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TaglibUriType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TransportGuaranteeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TransportGuaranteeType.java
index d5210b3c0..d5210b3c0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/TransportGuaranteeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/TransportGuaranteeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/UrlPatternType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/UrlPatternType.java
index 7d7a59939..7d7a59939 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/UserDataConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/UserDataConstraintType.java
index 8f6929517..8f6929517 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/UserDataConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/UserDataConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WebAppType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WebAppType.java
index 071c2a1b3..071c2a1b3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WebAppType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WebAppType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WebResourceCollectionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WebResourceCollectionType.java
index de7c3f67d..de7c3f67d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WebResourceCollectionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WebResourceCollectionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WebResourceNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WebResourceNameType.java
index fc15075dc..fc15075dc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WebResourceNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WebResourceNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Factory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Factory.java
index 3d1546366..3d1546366 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Factory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Factory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Package.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Package.java
index d20333167..d20333167 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Package.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/Webapp22Package.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileListType.java
index 27a105e8c..27a105e8c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileType.java
index 50b873e66..50b873e66 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/WelcomeFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthConstraintTypeImpl.java
index 8e178e453..8e178e453 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthMethodTypeImpl.java
index 708fcea28..708fcea28 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/AuthMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ContextParamTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ContextParamTypeImpl.java
index e4b23528f..e4b23528f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ContextParamTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ContextParamTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DescriptionTypeImpl.java
index 407a26e2a..407a26e2a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DisplayNameTypeImpl.java
index b5b6dca39..b5b6dca39 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DistributableTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DistributableTypeImpl.java
index b3f658e8e..b3f658e8e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DistributableTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DistributableTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DocumentRootImpl.java
index f0e53506d..f0e53506d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbLinkTypeImpl.java
index 4462f8b34..4462f8b34 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefNameTypeImpl.java
index c82de6075..c82de6075 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeImpl.java
index 717190fdf..717190fdf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeTypeImpl.java
index c75ed830c..c75ed830c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryNameTypeImpl.java
index 38e45cf0d..38e45cf0d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeImpl.java
index c97f28307..c97f28307 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeTypeImpl.java
index 533194927..533194927 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryValueTypeImpl.java
index b5b29f2c9..b5b29f2c9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/EnvEntryValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorCodeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorCodeTypeImpl.java
index 54d4845cc..54d4845cc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorCodeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorCodeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorPageTypeImpl.java
index 73e368fd9..73e368fd9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ExceptionTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ExceptionTypeTypeImpl.java
index 680b92647..680b92647 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ExceptionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ExceptionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ExtensionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ExtensionTypeImpl.java
index 6bfd62328..6bfd62328 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ExtensionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ExtensionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/FormErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/FormErrorPageTypeImpl.java
index a46eb8c12..a46eb8c12 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/FormErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/FormErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginConfigTypeImpl.java
index 29313291f..29313291f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginPageTypeImpl.java
index 1d16b8f03..1d16b8f03 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/FormLoginPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/HomeTypeImpl.java
index 1b2b3f602..1b2b3f602 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/HttpMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/HttpMethodTypeImpl.java
index f6281252c..f6281252c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/HttpMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/HttpMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/IconTypeImpl.java
index c663cb00b..c663cb00b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/InitParamTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/InitParamTypeImpl.java
index d2ca744a4..d2ca744a4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/InitParamTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/InitParamTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/JspFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/JspFileTypeImpl.java
index d096b51ea..d096b51ea 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/JspFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/JspFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LargeIconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LargeIconTypeImpl.java
index 7b8f0ba8f..7b8f0ba8f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LargeIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LargeIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LoadOnStartupTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LoadOnStartupTypeImpl.java
index f1af68f6b..f1af68f6b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LoadOnStartupTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LoadOnStartupTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LocationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LocationTypeImpl.java
index c0a69dc9a..c0a69dc9a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LocationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LocationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LoginConfigTypeImpl.java
index 43fa4ae24..43fa4ae24 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/LoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/LoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeMappingTypeImpl.java
index 8606bbc66..8606bbc66 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeTypeTypeImpl.java
index 8b7ab3530..8b7ab3530 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/MimeTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamNameTypeImpl.java
index 0ab5a38b9..0ab5a38b9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamValueTypeImpl.java
index 5c86b3dfe..5c86b3dfe 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RealmNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RealmNameTypeImpl.java
index ec0dcfc84..ec0dcfc84 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RealmNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RealmNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RemoteTypeImpl.java
index d71e9f0bc..d71e9f0bc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResAuthTypeImpl.java
index 54793f6f3..54793f6f3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResRefNameTypeImpl.java
index 0b95c6f38..0b95c6f38 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResTypeTypeImpl.java
index cfe6be076..cfe6be076 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResourceRefTypeImpl.java
index 297f19935..297f19935 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleLinkTypeImpl.java
index 046f640d7..046f640d7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleNameTypeImpl.java
index 99e5c80a0..99e5c80a0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityConstraintTypeImpl.java
index 32e3aa7ff..32e3aa7ff 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleRefTypeImpl.java
index a748acfc3..a748acfc3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleTypeImpl.java
index aca85f78f..aca85f78f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletClassTypeImpl.java
index beb8cd781..beb8cd781 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletMappingTypeImpl.java
index c77c6e835..c77c6e835 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletNameTypeImpl.java
index 22ed3fd35..22ed3fd35 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletTypeImpl.java
index 72759c6ee..72759c6ee 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/ServletTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionConfigTypeImpl.java
index 8134ad20f..8134ad20f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionTimeoutTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionTimeoutTypeImpl.java
index 7d112f791..7d112f791 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionTimeoutTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SessionTimeoutTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SmallIconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SmallIconTypeImpl.java
index 491ccb49f..491ccb49f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/SmallIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/SmallIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibLocationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibLocationTypeImpl.java
index f5f4d77e8..f5f4d77e8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibLocationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibLocationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibTypeImpl.java
index b133c3771..b133c3771 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibUriTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibUriTypeImpl.java
index b8c7a1546..b8c7a1546 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibUriTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TaglibUriTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TransportGuaranteeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TransportGuaranteeTypeImpl.java
index 3f37e09ed..3f37e09ed 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/TransportGuaranteeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/TransportGuaranteeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/UrlPatternTypeImpl.java
index 969ed7659..969ed7659 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/UserDataConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/UserDataConstraintTypeImpl.java
index 299df4f44..299df4f44 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/UserDataConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/UserDataConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WebAppTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WebAppTypeImpl.java
index 0fba086e8..0fba086e8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WebAppTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WebAppTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceCollectionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceCollectionTypeImpl.java
index 0e4d55743..0e4d55743 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceCollectionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceCollectionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceNameTypeImpl.java
index c1521f64c..c1521f64c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WebResourceNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22FactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22FactoryImpl.java
index ae71c7cce..ae71c7cce 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22FactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22PackageImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22PackageImpl.java
index ea945d6a8..ea945d6a8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22PackageImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/Webapp22PackageImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileListTypeImpl.java
index 2a06d3677..2a06d3677 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileTypeImpl.java
index 5f039d78f..5f039d78f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/impl/WelcomeFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22AdapterFactory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22AdapterFactory.java
index 2692aae6f..2692aae6f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22AdapterFactory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceFactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceFactoryImpl.java
index c1eaeedb6..c1eaeedb6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceImpl.java
index 7849d4548..7849d4548 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22Switch.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22Switch.java
index 3a6c4a0b0..3a6c4a0b0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22Switch.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22Switch.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22XMLProcessor.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22XMLProcessor.java
index 69684ac75..69684ac75 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22XMLProcessor.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp22/util/Webapp22XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/AuthConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/AuthConstraintType.java
index ba2733e42..ba2733e42 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/AuthConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/AuthConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/AuthMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/AuthMethodType.java
index e234cd25c..e234cd25c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/AuthMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/AuthMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ContextParamType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ContextParamType.java
index 52a1c8b09..52a1c8b09 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ContextParamType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ContextParamType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DescriptionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DescriptionType.java
index b671f5da3..b671f5da3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DescriptionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DisplayNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DisplayNameType.java
index d051258d5..d051258d5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DistributableType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DistributableType.java
index 0919ba75b..0919ba75b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DistributableType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DistributableType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DocumentRoot.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DocumentRoot.java
index ec634b381..ec634b381 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbLinkType.java
index 8c00dfc34..8c00dfc34 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbLocalRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbLocalRefType.java
index 12da93551..12da93551 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbRefNameType.java
index cab94856e..cab94856e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbRefType.java
index ef824c9ca..ef824c9ca 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbRefTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbRefTypeType.java
index cbbb05d34..cbbb05d34 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryNameType.java
index abd0ba0ad..abd0ba0ad 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryType.java
index c764e7973..c764e7973 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryTypeType.java
index 6007404aa..6007404aa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryValueType.java
index d5d314c36..d5d314c36 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/EnvEntryValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ErrorCodeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ErrorCodeType.java
index 094caf3f3..094caf3f3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ErrorCodeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ErrorCodeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ErrorPageType.java
index 748ba2bce..748ba2bce 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ExceptionTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ExceptionTypeType.java
index f81c9224d..f81c9224d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ExceptionTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ExceptionTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ExtensionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ExtensionType.java
index b17b98df1..b17b98df1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ExtensionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ExtensionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterClassType.java
index bcbc3f14d..bcbc3f14d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterMappingType.java
index c45cb9b12..c45cb9b12 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterNameType.java
index 0e21f49f3..0e21f49f3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterType.java
index 29f2ec2be..29f2ec2be 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FilterType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FilterType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FormErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FormErrorPageType.java
index 29bc2b6ed..29bc2b6ed 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FormErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FormErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FormLoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FormLoginConfigType.java
index 7cc817b87..7cc817b87 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FormLoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FormLoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FormLoginPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FormLoginPageType.java
index b663d6c90..b663d6c90 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/FormLoginPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/FormLoginPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/HomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/HomeType.java
index d54e51039..d54e51039 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/HomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/HomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/HttpMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/HttpMethodType.java
index bb54d76fd..bb54d76fd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/HttpMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/HttpMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/IconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/IconType.java
index 45912ec30..45912ec30 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/IconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/IconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/InitParamType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/InitParamType.java
index 93bf336dc..93bf336dc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/InitParamType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/InitParamType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/JspFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/JspFileType.java
index 937b8066c..937b8066c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/JspFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/JspFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LargeIconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LargeIconType.java
index 142b4850e..142b4850e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LargeIconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LargeIconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ListenerClass.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ListenerClass.java
index d0dbeedcc..d0dbeedcc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ListenerClass.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ListenerClass.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ListenerClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ListenerClassType.java
index 361a3e5fd..361a3e5fd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ListenerClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ListenerClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ListenerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ListenerType.java
index 81dd4230b..81dd4230b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ListenerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ListenerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LoadOnStartupType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LoadOnStartupType.java
index 3b371616c..3b371616c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LoadOnStartupType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LoadOnStartupType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LocalHomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LocalHomeType.java
index 9972d02d8..9972d02d8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LocalType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LocalType.java
index d68f0fc0e..d68f0fc0e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LocalType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LocalType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LocationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LocationType.java
index 7122315f6..7122315f6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LocationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LocationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LoginConfigType.java
index 3cf76444a..3cf76444a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/LoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/LoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/MimeMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/MimeMappingType.java
index e49ff3bc6..e49ff3bc6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/MimeMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/MimeMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/MimeTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/MimeTypeType.java
index 99a3bc64b..99a3bc64b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/MimeTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/MimeTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ParamNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ParamNameType.java
index 3883889ad..3883889ad 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ParamNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ParamNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ParamValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ParamValueType.java
index f812346e0..f812346e0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ParamValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RealmNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RealmNameType.java
index ff7ef666c..ff7ef666c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RealmNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RealmNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RemoteType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RemoteType.java
index d8c3c7aa1..d8c3c7aa1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RemoteType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RemoteType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResAuthType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResAuthType.java
index b10ee023b..b10ee023b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResAuthType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResRefNameType.java
index f31668ee3..f31668ee3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResSharingScopeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResSharingScopeType.java
index e2b5f74ee..e2b5f74ee 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResTypeType.java
index 2b1080a77..2b1080a77 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefNameType.java
index 3ee51c83e..3ee51c83e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefType.java
index b7abb111d..b7abb111d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefTypeType.java
index ac0b2080a..ac0b2080a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceEnvRefTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceRefType.java
index c004aa772..c004aa772 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RoleLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RoleLinkType.java
index 18ebda126..18ebda126 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RoleLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RoleLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RoleNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RoleNameType.java
index daf96d479..daf96d479 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RoleNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RunAsType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RunAsType.java
index 68eb31592..68eb31592 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/RunAsType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/RunAsType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SecurityConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SecurityConstraintType.java
index 54d965413..54d965413 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SecurityConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SecurityConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleRefType.java
index 8df25914f..8df25914f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleType.java
index 6b0dc7084..6b0dc7084 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletClassType.java
index 59e85d2cb..59e85d2cb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletMappingType.java
index ea123a70d..ea123a70d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletNameType.java
index f7d9e9888..f7d9e9888 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletType.java
index d18a52aa1..d18a52aa1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/ServletType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/ServletType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SessionConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SessionConfigType.java
index 3d9d898d6..3d9d898d6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SessionConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SessionConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SessionTimeoutType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SessionTimeoutType.java
index 3657bc40f..3657bc40f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SessionTimeoutType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SessionTimeoutType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SmallIconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SmallIconType.java
index 3e6266894..3e6266894 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/SmallIconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/SmallIconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TaglibLocationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TaglibLocationType.java
index ffde5985b..ffde5985b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TaglibLocationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TaglibLocationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TaglibType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TaglibType.java
index 9ee6c3b11..9ee6c3b11 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TaglibType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TaglibType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TaglibUriType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TaglibUriType.java
index c80df177b..c80df177b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TaglibUriType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TaglibUriType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TransportGuaranteeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TransportGuaranteeType.java
index 40fbd99f3..40fbd99f3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/TransportGuaranteeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/TransportGuaranteeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/UrlPatternType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/UrlPatternType.java
index 52b4a84ad..52b4a84ad 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/UserDataConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/UserDataConstraintType.java
index 62daf0dae..62daf0dae 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/UserDataConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/UserDataConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WebAppType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WebAppType.java
index af24dee78..af24dee78 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WebAppType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WebAppType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WebResourceCollectionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WebResourceCollectionType.java
index 151af946d..151af946d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WebResourceCollectionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WebResourceCollectionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WebResourceNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WebResourceNameType.java
index 413054bc7..413054bc7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WebResourceNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WebResourceNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Factory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Factory.java
index b9f90ae37..b9f90ae37 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Factory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Factory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Package.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Package.java
index b35b2bfd3..b35b2bfd3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Package.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/Webapp23Package.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileListType.java
index de1e49b30..de1e49b30 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileType.java
index 51988105f..51988105f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/WelcomeFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthConstraintTypeImpl.java
index f1161bddd..f1161bddd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthMethodTypeImpl.java
index 3d121dd1a..3d121dd1a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/AuthMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ContextParamTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ContextParamTypeImpl.java
index e5cc463a4..e5cc463a4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ContextParamTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ContextParamTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DescriptionTypeImpl.java
index 39a869036..39a869036 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DisplayNameTypeImpl.java
index 60e8e4e2f..60e8e4e2f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DistributableTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DistributableTypeImpl.java
index 04d8dade0..04d8dade0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DistributableTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DistributableTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DocumentRootImpl.java
index b69ecb254..b69ecb254 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLinkTypeImpl.java
index 126e40bf2..126e40bf2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLocalRefTypeImpl.java
index b1c58fad5..b1c58fad5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefNameTypeImpl.java
index b7a633d51..b7a633d51 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeImpl.java
index e39e4b5f3..e39e4b5f3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeTypeImpl.java
index 85971231b..85971231b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryNameTypeImpl.java
index d6fbae6a0..d6fbae6a0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeImpl.java
index 0efc0bacf..0efc0bacf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeTypeImpl.java
index 9f9a7d06a..9f9a7d06a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryValueTypeImpl.java
index 6376a3532..6376a3532 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/EnvEntryValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorCodeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorCodeTypeImpl.java
index 5def035f5..5def035f5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorCodeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorCodeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorPageTypeImpl.java
index 20bebf7f4..20bebf7f4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ExceptionTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ExceptionTypeTypeImpl.java
index ae2508608..ae2508608 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ExceptionTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ExceptionTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ExtensionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ExtensionTypeImpl.java
index e61c7edef..e61c7edef 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ExtensionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ExtensionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterClassTypeImpl.java
index 0dadb37ca..0dadb37ca 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterMappingTypeImpl.java
index 358ec1056..358ec1056 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterNameTypeImpl.java
index 210ad5d87..210ad5d87 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterTypeImpl.java
index 07549bbd7..07549bbd7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FilterTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FormErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FormErrorPageTypeImpl.java
index b4f7e85bb..b4f7e85bb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FormErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FormErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginConfigTypeImpl.java
index eb7490bae..eb7490bae 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginPageTypeImpl.java
index c81a72a35..c81a72a35 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/FormLoginPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/HomeTypeImpl.java
index 017414f1b..017414f1b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/HttpMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/HttpMethodTypeImpl.java
index 85026132c..85026132c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/HttpMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/HttpMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/IconTypeImpl.java
index e2ee874d8..e2ee874d8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/InitParamTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/InitParamTypeImpl.java
index cd7194914..cd7194914 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/InitParamTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/InitParamTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/JspFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/JspFileTypeImpl.java
index b2b4cb8ff..b2b4cb8ff 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/JspFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/JspFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LargeIconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LargeIconTypeImpl.java
index d97dbe93a..d97dbe93a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LargeIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LargeIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassImpl.java
index 63d820718..63d820718 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassTypeImpl.java
index db807eedb..db807eedb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerTypeImpl.java
index 1e51e2caa..1e51e2caa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LoadOnStartupTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LoadOnStartupTypeImpl.java
index bac088a27..bac088a27 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LoadOnStartupTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LoadOnStartupTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalHomeTypeImpl.java
index 401a6331e..401a6331e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalTypeImpl.java
index 66e5b624b..66e5b624b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LocationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LocationTypeImpl.java
index e73688c4b..e73688c4b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LocationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LocationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LoginConfigTypeImpl.java
index 759cdd774..759cdd774 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/LoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/LoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeMappingTypeImpl.java
index 8e9e89bcf..8e9e89bcf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeTypeTypeImpl.java
index 899ee7494..899ee7494 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/MimeTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamNameTypeImpl.java
index df2afc4b0..df2afc4b0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamValueTypeImpl.java
index de9bcb0e5..de9bcb0e5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RealmNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RealmNameTypeImpl.java
index 1be9f90bc..1be9f90bc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RealmNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RealmNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RemoteTypeImpl.java
index 47947d367..47947d367 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResAuthTypeImpl.java
index 96f6fb22e..96f6fb22e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResRefNameTypeImpl.java
index 5603f352c..5603f352c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResSharingScopeTypeImpl.java
index e4c3caaa7..e4c3caaa7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResTypeTypeImpl.java
index 4e36801cd..4e36801cd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefNameTypeImpl.java
index ae0ecd131..ae0ecd131 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeImpl.java
index 45be2b91d..45be2b91d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeTypeImpl.java
index ec42a5055..ec42a5055 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceEnvRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceRefTypeImpl.java
index 07cc8baba..07cc8baba 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleLinkTypeImpl.java
index cb2568d57..cb2568d57 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleNameTypeImpl.java
index 8291207ce..8291207ce 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RunAsTypeImpl.java
index f5d82cf80..f5d82cf80 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityConstraintTypeImpl.java
index 31af3ee22..31af3ee22 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleRefTypeImpl.java
index 8d24675ac..8d24675ac 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleTypeImpl.java
index 12a434764..12a434764 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletClassTypeImpl.java
index da7650f63..da7650f63 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletMappingTypeImpl.java
index 7f37a465b..7f37a465b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletNameTypeImpl.java
index acd079591..acd079591 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletTypeImpl.java
index 383772609..383772609 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/ServletTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionConfigTypeImpl.java
index 82cdec0a9..82cdec0a9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionTimeoutTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionTimeoutTypeImpl.java
index 946f93064..946f93064 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionTimeoutTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SessionTimeoutTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SmallIconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SmallIconTypeImpl.java
index 84c320f76..84c320f76 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/SmallIconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/SmallIconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibLocationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibLocationTypeImpl.java
index d1754cc5e..d1754cc5e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibLocationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibLocationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibTypeImpl.java
index 89f268e23..89f268e23 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibUriTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibUriTypeImpl.java
index 2bd38922c..2bd38922c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibUriTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TaglibUriTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TransportGuaranteeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TransportGuaranteeTypeImpl.java
index a10b9d983..a10b9d983 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/TransportGuaranteeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/TransportGuaranteeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/UrlPatternTypeImpl.java
index 9bfe1dbf3..9bfe1dbf3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/UserDataConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/UserDataConstraintTypeImpl.java
index 4752a888b..4752a888b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/UserDataConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/UserDataConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WebAppTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WebAppTypeImpl.java
index 206bed41c..206bed41c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WebAppTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WebAppTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceCollectionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceCollectionTypeImpl.java
index 3f88d4b77..3f88d4b77 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceCollectionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceCollectionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceNameTypeImpl.java
index 8f9b24256..8f9b24256 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WebResourceNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23FactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23FactoryImpl.java
index e451f52e9..e451f52e9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23FactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23PackageImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23PackageImpl.java
index 55c906a46..55c906a46 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23PackageImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/Webapp23PackageImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileListTypeImpl.java
index f5951e7be..f5951e7be 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileTypeImpl.java
index 471f06c69..471f06c69 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/impl/WelcomeFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23AdapterFactory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23AdapterFactory.java
index 11ff0c85e..11ff0c85e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23AdapterFactory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceFactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceFactoryImpl.java
index ac9ac72b9..ac9ac72b9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceImpl.java
index 87200441f..87200441f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23Switch.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23Switch.java
index 7e8e1571a..7e8e1571a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23Switch.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23Switch.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23XMLProcessor.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23XMLProcessor.java
index 3a33a3a8c..3a33a3a8c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23XMLProcessor.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp23/util/Webapp23XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/AuthConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/AuthConstraintType.java
index 68e06c3d3..68e06c3d3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/AuthConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/AuthConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/AuthMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/AuthMethodType.java
index 76d2f6c22..76d2f6c22 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/AuthMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/AuthMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DescriptionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DescriptionType.java
index deaf79d76..deaf79d76 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DescriptionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DispatcherType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DispatcherType.java
index 9044b7a5d..9044b7a5d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DispatcherType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DispatcherType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DispatcherTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DispatcherTypeBase.java
index 3cc0a507f..3cc0a507f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DispatcherTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DispatcherTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DisplayNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DisplayNameType.java
index 0a195ee13..0a195ee13 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DocumentRoot.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DocumentRoot.java
index df5f6682e..df5f6682e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbLinkType.java
index f130b2300..f130b2300 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbLocalRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbLocalRefType.java
index 33d4de10f..33d4de10f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefNameType.java
index d20f1f466..d20f1f466 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefType.java
index d737eec53..d737eec53 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeType.java
index 1bba9faa5..1bba9faa5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeTypeBase.java
index eaacd2cbf..eaacd2cbf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EjbRefTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EmptyType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EmptyType.java
index e2487ec0d..e2487ec0d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EmptyType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EmptyType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryType.java
index 5b78fbedd..5b78fbedd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesType.java
index 82d2f36fb..82d2f36fb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesTypeBase.java
index a9d575833..a9d575833 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/EnvEntryTypeValuesTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ErrorCodeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ErrorCodeType.java
index 8cd922fb4..8cd922fb4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ErrorCodeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ErrorCodeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ErrorPageType.java
index 3959d1be1..3959d1be1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FilterMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FilterMappingType.java
index 901795067..901795067 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FilterMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FilterMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FilterNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FilterNameType.java
index 7ef9354a3..7ef9354a3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FilterNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FilterNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FilterType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FilterType.java
index a4f271467..a4f271467 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FilterType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FilterType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FormLoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FormLoginConfigType.java
index 255824248..255824248 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FormLoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FormLoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FullyQualifiedClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FullyQualifiedClassType.java
index d22c66268..d22c66268 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/FullyQualifiedClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/FullyQualifiedClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanType.java
index 6eadd4abe..6eadd4abe 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanTypeBase.java
index 8f69c1438..8f69c1438 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/GenericBooleanTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/HomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/HomeType.java
index bc1e9658d..bc1e9658d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/HomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/HomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodType.java
index 4d4795693..4d4795693 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodTypeBase.java
index 10c6479bf..10c6479bf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/HttpMethodTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/IconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/IconType.java
index 72c7cbda3..72c7cbda3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/IconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/IconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JavaIdentifierType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JavaIdentifierType.java
index c36d84c5e..c36d84c5e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JavaIdentifierType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JavaIdentifierType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JavaTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JavaTypeType.java
index 331ed6a7a..331ed6a7a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JavaTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JavaTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JndiNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JndiNameType.java
index a3c878e85..a3c878e85 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JndiNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JndiNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JspConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JspConfigType.java
index 724a23586..724a23586 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JspConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JspConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JspFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JspFileType.java
index f73bc47a1..f73bc47a1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JspFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JspFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JspPropertyGroupType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JspPropertyGroupType.java
index 7d8eddc68..7d8eddc68 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/JspPropertyGroupType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/JspPropertyGroupType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ListenerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ListenerType.java
index b9f8c385c..b9f8c385c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ListenerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ListenerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocalHomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocalHomeType.java
index ade0905ce..ade0905ce 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocalType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocalType.java
index 4f150da9f..4f150da9f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocalType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocalType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingListType.java
index 985639e45..985639e45 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingType.java
index 3d481777f..3d481777f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LocaleEncodingMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LoginConfigType.java
index cdf87ab4a..cdf87ab4a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/LoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/LoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationLinkType.java
index 496bdcef6..496bdcef6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationRefType.java
index a7aee92f7..a7aee92f7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationType.java
index 3ea1a0bf7..3ea1a0bf7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationTypeType.java
index b58a1d7bc..b58a1d7bc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageType.java
index f6f16c9c3..f6f16c9c3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageTypeBase.java
index 104f8fbe4..104f8fbe4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MessageDestinationUsageTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MimeMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MimeMappingType.java
index 6de9d8a99..6de9d8a99 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MimeMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MimeMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MimeTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MimeTypeType.java
index 458df6e4d..458df6e4d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/MimeTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/MimeTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/NonEmptyStringType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/NonEmptyStringType.java
index 90eca59bf..90eca59bf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/NonEmptyStringType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/NonEmptyStringType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ParamValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ParamValueType.java
index 4d83caf98..4d83caf98 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ParamValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/PathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/PathType.java
index d89364714..d89364714 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/PathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/PathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/PortComponentRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/PortComponentRefType.java
index 7e5648e84..7e5648e84 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/PortComponentRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/PortComponentRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/RemoteType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/RemoteType.java
index b2029dff1..b2029dff1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/RemoteType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/RemoteType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResAuthType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResAuthType.java
index 1aa469df6..1aa469df6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResAuthType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResAuthTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResAuthTypeBase.java
index 3c3c8cedf..3c3c8cedf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResAuthTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResAuthTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeType.java
index 1e50c0e22..1e50c0e22 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeTypeBase.java
index 4eacdccad..4eacdccad 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResSharingScopeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResourceEnvRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResourceEnvRefType.java
index 9fb6de97b..9fb6de97b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResourceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResourceRefType.java
index b2f414761..b2f414761 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/RoleNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/RoleNameType.java
index 0802759db..0802759db 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/RoleNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/RunAsType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/RunAsType.java
index c8d3d8336..c8d3d8336 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/RunAsType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/RunAsType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SecurityConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SecurityConstraintType.java
index 7aaf3f0cf..7aaf3f0cf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SecurityConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SecurityConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleRefType.java
index a50e0c8ed..a50e0c8ed 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleType.java
index 34415e4d8..34415e4d8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefHandlerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefHandlerType.java
index f305fe287..f305fe287 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefHandlerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefHandlerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefType.java
index 77264592e..77264592e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServiceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServletMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServletMappingType.java
index 8601b50e1..8601b50e1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServletMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServletMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServletNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServletNameType.java
index 33333c901..33333c901 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServletNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServletNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServletType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServletType.java
index 32d868307..32d868307 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/ServletType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/ServletType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SessionConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SessionConfigType.java
index c8b98a697..c8b98a697 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/SessionConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/SessionConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/String.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/String.java
index 0ba00059f..0ba00059f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/String.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/String.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TaglibType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TaglibType.java
index 511df153e..511df153e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TaglibType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TaglibType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeType.java
index 5438e49ec..5438e49ec 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeTypeBase.java
index ea6abaeab..ea6abaeab 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TransportGuaranteeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TrueFalseType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TrueFalseType.java
index 2c1856008..2c1856008 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/TrueFalseType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/TrueFalseType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/UrlPatternType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/UrlPatternType.java
index 7a84dacb4..7a84dacb4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/UserDataConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/UserDataConstraintType.java
index 8c8da31b9..8c8da31b9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/UserDataConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/UserDataConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WarPathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WarPathType.java
index 1936c17ef..1936c17ef 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WarPathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WarPathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WebAppType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WebAppType.java
index 16ef22d62..16ef22d62 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WebAppType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WebAppType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WebAppVersionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WebAppVersionType.java
index 6cd321830..6cd321830 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WebAppVersionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WebAppVersionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WebResourceCollectionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WebResourceCollectionType.java
index c321d2f79..c321d2f79 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WebResourceCollectionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WebResourceCollectionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Factory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Factory.java
index 4bc24ddf7..4bc24ddf7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Factory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Factory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Package.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Package.java
index 3975aae5e..3975aae5e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Package.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/Webapp24Package.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WelcomeFileListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WelcomeFileListType.java
index 88e79e580..88e79e580 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/WelcomeFileListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/WelcomeFileListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdAnyURIType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdAnyURIType.java
index a6e519bd0..a6e519bd0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdAnyURIType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdAnyURIType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdBooleanType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdBooleanType.java
index 872f26e29..872f26e29 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdBooleanType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdBooleanType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdIntegerType.java
index fa0a06de1..fa0a06de1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdNMTOKENType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdNMTOKENType.java
index 273315c4c..273315c4c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdNMTOKENType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdNMTOKENType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdNonNegativeIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdNonNegativeIntegerType.java
index 82d80b799..82d80b799 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdNonNegativeIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdNonNegativeIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdPositiveIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdPositiveIntegerType.java
index 2d795fc2c..2d795fc2c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdPositiveIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdPositiveIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdQNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdQNameType.java
index cb448708f..cb448708f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdQNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdQNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdStringType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdStringType.java
index 017f676fc..017f676fc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/XsdStringType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/XsdStringType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthConstraintTypeImpl.java
index dbe2f2028..dbe2f2028 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthMethodTypeImpl.java
index 4ef2afc39..4ef2afc39 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/AuthMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DescriptionTypeImpl.java
index a37e9d406..a37e9d406 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DispatcherTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DispatcherTypeImpl.java
index a03a578ee..a03a578ee 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DispatcherTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DispatcherTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DisplayNameTypeImpl.java
index e65adc178..e65adc178 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DocumentRootImpl.java
index 3cc0709dc..3cc0709dc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLinkTypeImpl.java
index c3836ecc9..c3836ecc9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLocalRefTypeImpl.java
index 5381e444a..5381e444a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefNameTypeImpl.java
index 1dac598b8..1dac598b8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeImpl.java
index 7e02748c8..7e02748c8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeTypeImpl.java
index 9d3b6c5a2..9d3b6c5a2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EmptyTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EmptyTypeImpl.java
index bfe7a3dfc..bfe7a3dfc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EmptyTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EmptyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeImpl.java
index 879af2968..879af2968 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeValuesTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeValuesTypeImpl.java
index d24c9df9f..d24c9df9f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeValuesTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/EnvEntryTypeValuesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorCodeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorCodeTypeImpl.java
index 94ac4583a..94ac4583a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorCodeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorCodeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorPageTypeImpl.java
index 10cb59b70..10cb59b70 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterMappingTypeImpl.java
index 058fc8234..058fc8234 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterNameTypeImpl.java
index f94718b7a..f94718b7a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterTypeImpl.java
index 3cb32702d..3cb32702d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FilterTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FormLoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FormLoginConfigTypeImpl.java
index b11b7b682..b11b7b682 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FormLoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FormLoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FullyQualifiedClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FullyQualifiedClassTypeImpl.java
index 3a1fea10c..3a1fea10c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/FullyQualifiedClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/FullyQualifiedClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/GenericBooleanTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/GenericBooleanTypeImpl.java
index 7a35bc81f..7a35bc81f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/GenericBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/GenericBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/HomeTypeImpl.java
index 71e9bd749..71e9bd749 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/HttpMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/HttpMethodTypeImpl.java
index db40071ce..db40071ce 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/HttpMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/HttpMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/IconTypeImpl.java
index 31ca4219f..31ca4219f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaIdentifierTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaIdentifierTypeImpl.java
index d39dac1f9..d39dac1f9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaIdentifierTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaIdentifierTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaTypeTypeImpl.java
index 0aa40900d..0aa40900d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JavaTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JndiNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JndiNameTypeImpl.java
index fa7285f8a..fa7285f8a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JndiNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JndiNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JspConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JspConfigTypeImpl.java
index 4352ff975..4352ff975 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JspConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JspConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JspFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JspFileTypeImpl.java
index ba6839805..ba6839805 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JspFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JspFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JspPropertyGroupTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JspPropertyGroupTypeImpl.java
index d61f30ceb..d61f30ceb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/JspPropertyGroupTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/JspPropertyGroupTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ListenerTypeImpl.java
index 9e494ae85..9e494ae85 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalHomeTypeImpl.java
index a86c57e5e..a86c57e5e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalTypeImpl.java
index f643f3326..f643f3326 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingListTypeImpl.java
index ecc70998d..ecc70998d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingTypeImpl.java
index 7a4a32d06..7a4a32d06 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LocaleEncodingMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LoginConfigTypeImpl.java
index f3a8094bb..f3a8094bb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/LoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/LoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationLinkTypeImpl.java
index d2a251d06..d2a251d06 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationRefTypeImpl.java
index d7c36c321..d7c36c321 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeImpl.java
index e149e1a5d..e149e1a5d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeTypeImpl.java
index 7773af948..7773af948 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationUsageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationUsageTypeImpl.java
index bb8ff9c4b..bb8ff9c4b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationUsageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MessageDestinationUsageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeMappingTypeImpl.java
index a4270c568..a4270c568 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeTypeTypeImpl.java
index 17dbc0f5e..17dbc0f5e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/MimeTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/NonEmptyStringTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/NonEmptyStringTypeImpl.java
index 6a42fd1df..6a42fd1df 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/NonEmptyStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/NonEmptyStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ParamValueTypeImpl.java
index 59707d36f..59707d36f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/PathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/PathTypeImpl.java
index 641f386b2..641f386b2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/PathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/PathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/PortComponentRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/PortComponentRefTypeImpl.java
index 8606229c8..8606229c8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/PortComponentRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/PortComponentRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/RemoteTypeImpl.java
index 8505475b3..8505475b3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResAuthTypeImpl.java
index 402e14118..402e14118 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResSharingScopeTypeImpl.java
index fdfeb0361..fdfeb0361 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceEnvRefTypeImpl.java
index 5c6bef86a..5c6bef86a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceRefTypeImpl.java
index 53466355f..53466355f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/RoleNameTypeImpl.java
index 3593d075b..3593d075b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/RunAsTypeImpl.java
index c5c37df31..c5c37df31 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityConstraintTypeImpl.java
index fd79032d9..fd79032d9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleRefTypeImpl.java
index e10e2c205..e10e2c205 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleTypeImpl.java
index beaedd2ba..beaedd2ba 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefHandlerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefHandlerTypeImpl.java
index 1b92cf906..1b92cf906 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefHandlerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefHandlerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefTypeImpl.java
index 01ab14e8c..01ab14e8c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServiceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletMappingTypeImpl.java
index 08f689353..08f689353 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletNameTypeImpl.java
index 77e532bf4..77e532bf4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletTypeImpl.java
index e02a83c82..e02a83c82 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/ServletTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SessionConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SessionConfigTypeImpl.java
index 83eb434b7..83eb434b7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/SessionConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/SessionConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/StringImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/StringImpl.java
index b2288bece..b2288bece 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/StringImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/StringImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/TaglibTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/TaglibTypeImpl.java
index aefec52d3..aefec52d3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/TaglibTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/TaglibTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/TransportGuaranteeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/TransportGuaranteeTypeImpl.java
index b487d850a..b487d850a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/TransportGuaranteeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/TransportGuaranteeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/TrueFalseTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/TrueFalseTypeImpl.java
index 6ff133612..6ff133612 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/TrueFalseTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/TrueFalseTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/UrlPatternTypeImpl.java
index 3c51eec9b..3c51eec9b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/UserDataConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/UserDataConstraintTypeImpl.java
index b5204e259..b5204e259 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/UserDataConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/UserDataConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WarPathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WarPathTypeImpl.java
index 5265148d4..5265148d4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WarPathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WarPathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WebAppTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WebAppTypeImpl.java
index 50a780fac..50a780fac 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WebAppTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WebAppTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WebResourceCollectionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WebResourceCollectionTypeImpl.java
index 5aeec652e..5aeec652e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WebResourceCollectionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WebResourceCollectionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24FactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24FactoryImpl.java
index 2a0e0a91c..2a0e0a91c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24FactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24PackageImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24PackageImpl.java
index d431ab623..d431ab623 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24PackageImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/Webapp24PackageImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WelcomeFileListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WelcomeFileListTypeImpl.java
index 7b5b64db7..7b5b64db7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/WelcomeFileListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/WelcomeFileListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdAnyURITypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdAnyURITypeImpl.java
index 306d500b8..306d500b8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdAnyURITypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdAnyURITypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdBooleanTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdBooleanTypeImpl.java
index cb485360f..cb485360f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdIntegerTypeImpl.java
index 4af3e509a..4af3e509a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNMTOKENTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNMTOKENTypeImpl.java
index a6553bf17..a6553bf17 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNMTOKENTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNMTOKENTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNonNegativeIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNonNegativeIntegerTypeImpl.java
index 713026dc0..713026dc0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNonNegativeIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdNonNegativeIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdPositiveIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdPositiveIntegerTypeImpl.java
index a3ec01a9f..a3ec01a9f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdPositiveIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdPositiveIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdQNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdQNameTypeImpl.java
index a0efa38ab..a0efa38ab 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdQNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdQNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdStringTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdStringTypeImpl.java
index 447a4552c..447a4552c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/impl/XsdStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24AdapterFactory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24AdapterFactory.java
index 432428119..432428119 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24AdapterFactory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceFactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceFactoryImpl.java
index 16dc6c6f4..16dc6c6f4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceImpl.java
index ee01b8332..ee01b8332 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Switch.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Switch.java
index 60de48064..60de48064 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Switch.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Switch.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Validator.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Validator.java
index 4886f3327..4886f3327 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Validator.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24Validator.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24XMLProcessor.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24XMLProcessor.java
index 1954c7ac8..1954c7ac8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24XMLProcessor.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp24/util/Webapp24XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/AuthConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/AuthConstraintType.java
index 5c510e9c2..5c510e9c2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/AuthConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/AuthConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/AuthMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/AuthMethodType.java
index 2fa6c1d4a..2fa6c1d4a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/AuthMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/AuthMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DescriptionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DescriptionType.java
index 40c0f4609..40c0f4609 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DescriptionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DispatcherType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DispatcherType.java
index f9cc9a12f..f9cc9a12f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DispatcherType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DispatcherType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DispatcherTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DispatcherTypeBase.java
index a540e9ed6..a540e9ed6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DispatcherTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DispatcherTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DisplayNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DisplayNameType.java
index 984ad7985..984ad7985 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DocumentRoot.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DocumentRoot.java
index dd4e86b05..dd4e86b05 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbLinkType.java
index 9dda55668..9dda55668 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbLocalRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbLocalRefType.java
index f8f5a20d3..f8f5a20d3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefNameType.java
index 2512b6ce1..2512b6ce1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefType.java
index 2f498ed11..2f498ed11 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeType.java
index 058909672..058909672 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeTypeBase.java
index 9e44369b0..9e44369b0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EjbRefTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EmptyType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EmptyType.java
index 31af0c9a2..31af0c9a2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EmptyType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EmptyType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryType.java
index 1accc44a4..1accc44a4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesType.java
index 9f614ec0c..9f614ec0c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesTypeBase.java
index 6da8c1d8b..6da8c1d8b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/EnvEntryTypeValuesTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ErrorCodeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ErrorCodeType.java
index 033446ed7..033446ed7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ErrorCodeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ErrorCodeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ErrorPageType.java
index 78f125960..78f125960 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FilterMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FilterMappingType.java
index c34eda9de..c34eda9de 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FilterMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FilterMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FilterNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FilterNameType.java
index 53cb9f56d..53cb9f56d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FilterNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FilterNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FilterType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FilterType.java
index f4a61b3e9..f4a61b3e9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FilterType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FilterType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FormLoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FormLoginConfigType.java
index 66c728210..66c728210 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FormLoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FormLoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FullyQualifiedClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FullyQualifiedClassType.java
index b588bc59e..b588bc59e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/FullyQualifiedClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/FullyQualifiedClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanType.java
index cf14088c2..cf14088c2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanTypeBase.java
index f23b0a864..f23b0a864 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/GenericBooleanTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/HomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/HomeType.java
index 6fe1e044a..6fe1e044a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/HomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/HomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/IconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/IconType.java
index 56910e8d1..56910e8d1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/IconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/IconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/InjectionTargetType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/InjectionTargetType.java
index 049dd57db..049dd57db 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/InjectionTargetType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/InjectionTargetType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JavaIdentifierType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JavaIdentifierType.java
index dc4e8c149..dc4e8c149 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JavaIdentifierType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JavaIdentifierType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JavaTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JavaTypeType.java
index 39be2649a..39be2649a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JavaTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JavaTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JndiNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JndiNameType.java
index 652f19a07..652f19a07 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JndiNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JndiNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JspConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JspConfigType.java
index 42ce424b7..42ce424b7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JspConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JspConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JspFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JspFileType.java
index 0bd216df2..0bd216df2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JspFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JspFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JspPropertyGroupType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JspPropertyGroupType.java
index ff957dafd..ff957dafd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/JspPropertyGroupType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/JspPropertyGroupType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LifecycleCallbackType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LifecycleCallbackType.java
index cbfbc542f..cbfbc542f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LifecycleCallbackType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LifecycleCallbackType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ListenerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ListenerType.java
index 572d9c353..572d9c353 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ListenerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ListenerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocalHomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocalHomeType.java
index 5478af438..5478af438 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocalType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocalType.java
index 14c080050..14c080050 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocalType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocalType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingListType.java
index 693a1eda4..693a1eda4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingType.java
index 82710b975..82710b975 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LocaleEncodingMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LoginConfigType.java
index 3161cc2a7..3161cc2a7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/LoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/LoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationLinkType.java
index c2f5dac4a..c2f5dac4a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationRefType.java
index 9bde5407f..9bde5407f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationType.java
index 0594eafbf..0594eafbf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationTypeType.java
index bbb1498e9..bbb1498e9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageType.java
index bb929994c..bb929994c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageTypeBase.java
index 883cac36f..883cac36f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MessageDestinationUsageTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MimeMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MimeMappingType.java
index 50697b535..50697b535 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MimeMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MimeMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MimeTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MimeTypeType.java
index e30a0f235..e30a0f235 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/MimeTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/MimeTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/NonEmptyStringType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/NonEmptyStringType.java
index ce42efc63..ce42efc63 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/NonEmptyStringType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/NonEmptyStringType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/NullCharType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/NullCharType.java
index fc1fb3c0f..fc1fb3c0f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/NullCharType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/NullCharType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ParamValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ParamValueType.java
index 0016965d9..0016965d9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ParamValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PathType.java
index c2ab1c147..c2ab1c147 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextRefType.java
index bc2eec5b3..bc2eec5b3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeType.java
index a5dc33154..a5dc33154 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeTypeBase.java
index 8c2cebd39..8c2cebd39 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceContextTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceUnitRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceUnitRefType.java
index 50eab29f8..50eab29f8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PersistenceUnitRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PersistenceUnitRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PortComponentRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PortComponentRefType.java
index 5b29842f0..5b29842f0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PortComponentRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PortComponentRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PropertyType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PropertyType.java
index 0b8e89588..0b8e89588 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/PropertyType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/PropertyType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/RemoteType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/RemoteType.java
index 47e08baf1..47e08baf1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/RemoteType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/RemoteType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResAuthType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResAuthType.java
index 6af099965..6af099965 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResAuthType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResAuthTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResAuthTypeBase.java
index f03c41d55..f03c41d55 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResAuthTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResAuthTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeType.java
index 0f69234c8..0f69234c8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeTypeBase.java
index 6bb3e2de3..6bb3e2de3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResSharingScopeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResourceEnvRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResourceEnvRefType.java
index 56feb075d..56feb075d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResourceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResourceRefType.java
index 2db48f6fd..2db48f6fd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/RoleNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/RoleNameType.java
index bc06a9026..bc06a9026 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/RoleNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/RunAsType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/RunAsType.java
index c6c9fbcb8..c6c9fbcb8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/RunAsType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/RunAsType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SecurityConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SecurityConstraintType.java
index 4ebe4ee15..4ebe4ee15 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SecurityConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SecurityConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleRefType.java
index 4973102cc..4973102cc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleType.java
index 4041e6629..4041e6629 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainType.java
index 9b870c11e..9b870c11e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainsType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainsType.java
index e63caa5ce..e63caa5ce 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainsType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerChainsType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerType.java
index b20890c0b..b20890c0b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefHandlerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefType.java
index 91e811bc6..91e811bc6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServiceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServletMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServletMappingType.java
index d34b64e8c..d34b64e8c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServletMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServletMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServletNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServletNameType.java
index 7c81d8aab..7c81d8aab 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServletNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServletNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServletType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServletType.java
index b81b679bd..b81b679bd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/ServletType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/ServletType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SessionConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SessionConfigType.java
index b0811dfe1..b0811dfe1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/SessionConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/SessionConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/String.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/String.java
index acee7687f..acee7687f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/String.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/String.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TaglibType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TaglibType.java
index bc91b169e..bc91b169e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TaglibType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TaglibType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeType.java
index 6546e91d3..6546e91d3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeTypeBase.java
index 49e8bc81e..49e8bc81e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TransportGuaranteeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TrueFalseType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TrueFalseType.java
index 0e2902a0d..0e2902a0d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/TrueFalseType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/TrueFalseType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/UrlPatternType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/UrlPatternType.java
index 289e6ef11..289e6ef11 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/UserDataConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/UserDataConstraintType.java
index 7ca952e9f..7ca952e9f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/UserDataConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/UserDataConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WarPathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WarPathType.java
index b5e3bf825..b5e3bf825 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WarPathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WarPathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WebAppType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WebAppType.java
index c944e4a21..c944e4a21 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WebAppType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WebAppType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WebAppVersionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WebAppVersionType.java
index ae3c68375..ae3c68375 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WebAppVersionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WebAppVersionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WebResourceCollectionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WebResourceCollectionType.java
index 918b34a73..918b34a73 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WebResourceCollectionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WebResourceCollectionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Factory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Factory.java
index 0bc7a3872..0bc7a3872 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Factory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Factory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Package.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Package.java
index a39a83dc9..a39a83dc9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Package.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/Webapp25Package.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WelcomeFileListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WelcomeFileListType.java
index 67ef538a3..67ef538a3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/WelcomeFileListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/WelcomeFileListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdAnyURIType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdAnyURIType.java
index a6d055b01..a6d055b01 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdAnyURIType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdAnyURIType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdBooleanType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdBooleanType.java
index 964c29c2f..964c29c2f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdBooleanType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdBooleanType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdIntegerType.java
index 7c47fd093..7c47fd093 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdNMTOKENType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdNMTOKENType.java
index c58b684b6..c58b684b6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdNMTOKENType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdNMTOKENType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdNonNegativeIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdNonNegativeIntegerType.java
index badb6ccb3..badb6ccb3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdNonNegativeIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdNonNegativeIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdPositiveIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdPositiveIntegerType.java
index 23a88101d..23a88101d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdPositiveIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdPositiveIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdQNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdQNameType.java
index 31985c98b..31985c98b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdQNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdQNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdStringType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdStringType.java
index a3e4d211c..a3e4d211c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/XsdStringType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/XsdStringType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthConstraintTypeImpl.java
index 20a9ef0d9..20a9ef0d9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthMethodTypeImpl.java
index 86b48fc46..86b48fc46 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/AuthMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DescriptionTypeImpl.java
index 3a6ff30b5..3a6ff30b5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DispatcherTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DispatcherTypeImpl.java
index a47e4b678..a47e4b678 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DispatcherTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DispatcherTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DisplayNameTypeImpl.java
index 69140cb9e..69140cb9e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DocumentRootImpl.java
index 0980140eb..0980140eb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLinkTypeImpl.java
index bd81de2e5..bd81de2e5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLocalRefTypeImpl.java
index 1b573eed6..1b573eed6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefNameTypeImpl.java
index e90d69be0..e90d69be0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeImpl.java
index 094011312..094011312 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeTypeImpl.java
index 91c5b89f8..91c5b89f8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EmptyTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EmptyTypeImpl.java
index 12faee3d2..12faee3d2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EmptyTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EmptyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeImpl.java
index bc997ae37..bc997ae37 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeValuesTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeValuesTypeImpl.java
index f43d8b9dc..f43d8b9dc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeValuesTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/EnvEntryTypeValuesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorCodeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorCodeTypeImpl.java
index 0053e2300..0053e2300 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorCodeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorCodeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorPageTypeImpl.java
index afab08837..afab08837 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterMappingTypeImpl.java
index 52f87ae42..52f87ae42 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterNameTypeImpl.java
index 4e716c323..4e716c323 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterTypeImpl.java
index 28c0460c8..28c0460c8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FilterTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FormLoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FormLoginConfigTypeImpl.java
index 0588343a3..0588343a3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FormLoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FormLoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FullyQualifiedClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FullyQualifiedClassTypeImpl.java
index 5e5eab499..5e5eab499 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/FullyQualifiedClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/FullyQualifiedClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/GenericBooleanTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/GenericBooleanTypeImpl.java
index 59b961f3c..59b961f3c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/GenericBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/GenericBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/HomeTypeImpl.java
index 1e7389ac0..1e7389ac0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/IconTypeImpl.java
index 0b557e7e8..0b557e7e8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/InjectionTargetTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/InjectionTargetTypeImpl.java
index 86587fc92..86587fc92 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/InjectionTargetTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/InjectionTargetTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaIdentifierTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaIdentifierTypeImpl.java
index 7fa94ba3f..7fa94ba3f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaIdentifierTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaIdentifierTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaTypeTypeImpl.java
index a93e285fe..a93e285fe 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JavaTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JndiNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JndiNameTypeImpl.java
index 3b252625a..3b252625a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JndiNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JndiNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JspConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JspConfigTypeImpl.java
index 17db5206b..17db5206b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JspConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JspConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JspFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JspFileTypeImpl.java
index df39d9b28..df39d9b28 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JspFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JspFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JspPropertyGroupTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JspPropertyGroupTypeImpl.java
index 14ee53ff5..14ee53ff5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/JspPropertyGroupTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/JspPropertyGroupTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LifecycleCallbackTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LifecycleCallbackTypeImpl.java
index 8190ccddb..8190ccddb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LifecycleCallbackTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LifecycleCallbackTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ListenerTypeImpl.java
index 48b680b29..48b680b29 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalHomeTypeImpl.java
index 06900e633..06900e633 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalTypeImpl.java
index c1278b0a3..c1278b0a3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingListTypeImpl.java
index 19d9a04e9..19d9a04e9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingTypeImpl.java
index 8a4c5842c..8a4c5842c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LocaleEncodingMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LoginConfigTypeImpl.java
index 921c1e603..921c1e603 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/LoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/LoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationLinkTypeImpl.java
index e6739c027..e6739c027 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationRefTypeImpl.java
index 9954b89e4..9954b89e4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeImpl.java
index 146141033..146141033 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeTypeImpl.java
index 20d4fff39..20d4fff39 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationUsageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationUsageTypeImpl.java
index 85d7ae6cc..85d7ae6cc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationUsageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MessageDestinationUsageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeMappingTypeImpl.java
index dac74dc8f..dac74dc8f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeTypeTypeImpl.java
index 8234430dc..8234430dc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/MimeTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/NonEmptyStringTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/NonEmptyStringTypeImpl.java
index 93317da26..93317da26 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/NonEmptyStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/NonEmptyStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ParamValueTypeImpl.java
index af3946431..af3946431 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PathTypeImpl.java
index 8ac546af1..8ac546af1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextRefTypeImpl.java
index c67c6c61b..c67c6c61b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextTypeTypeImpl.java
index 676978750..676978750 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceContextTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceUnitRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceUnitRefTypeImpl.java
index 6aad276c8..6aad276c8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceUnitRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PersistenceUnitRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PortComponentRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PortComponentRefTypeImpl.java
index d8d8194e6..d8d8194e6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PortComponentRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PortComponentRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PropertyTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PropertyTypeImpl.java
index 4f246aa64..4f246aa64 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/PropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/PropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/RemoteTypeImpl.java
index 78c52a9bc..78c52a9bc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResAuthTypeImpl.java
index 42db70741..42db70741 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResSharingScopeTypeImpl.java
index 79cc795d1..79cc795d1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceEnvRefTypeImpl.java
index 4bbb7a4e9..4bbb7a4e9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceRefTypeImpl.java
index 662f1a963..662f1a963 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/RoleNameTypeImpl.java
index c261f3d34..c261f3d34 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/RunAsTypeImpl.java
index 999616255..999616255 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityConstraintTypeImpl.java
index 20f948d06..20f948d06 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleRefTypeImpl.java
index 3e5a0e89f..3e5a0e89f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleTypeImpl.java
index 1c00fbacf..1c00fbacf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainTypeImpl.java
index 4236e8d0d..4236e8d0d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainsTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainsTypeImpl.java
index f5c16ec78..f5c16ec78 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainsTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerChainsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerTypeImpl.java
index 0fde5ddef..0fde5ddef 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefHandlerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefTypeImpl.java
index ebf812861..ebf812861 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServiceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletMappingTypeImpl.java
index 255117720..255117720 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletNameTypeImpl.java
index 80c7db5a8..80c7db5a8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletTypeImpl.java
index 7dbd8f4c0..7dbd8f4c0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/ServletTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SessionConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SessionConfigTypeImpl.java
index 5fb0e1348..5fb0e1348 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/SessionConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/SessionConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/StringImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/StringImpl.java
index a0315897c..a0315897c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/StringImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/StringImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/TaglibTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/TaglibTypeImpl.java
index d41c72ae9..d41c72ae9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/TaglibTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/TaglibTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/TransportGuaranteeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/TransportGuaranteeTypeImpl.java
index 65dc234f5..65dc234f5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/TransportGuaranteeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/TransportGuaranteeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/TrueFalseTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/TrueFalseTypeImpl.java
index 52fb248f8..52fb248f8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/TrueFalseTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/TrueFalseTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/UrlPatternTypeImpl.java
index 95d2b8232..95d2b8232 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/UserDataConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/UserDataConstraintTypeImpl.java
index 0b58c6f3e..0b58c6f3e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/UserDataConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/UserDataConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WarPathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WarPathTypeImpl.java
index 85edbb85f..85edbb85f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WarPathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WarPathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WebAppTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WebAppTypeImpl.java
index e14615790..e14615790 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WebAppTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WebAppTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WebResourceCollectionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WebResourceCollectionTypeImpl.java
index c7fced7cd..c7fced7cd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WebResourceCollectionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WebResourceCollectionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25FactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25FactoryImpl.java
index ee01af326..ee01af326 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25FactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25PackageImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25PackageImpl.java
index 883212b9e..883212b9e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25PackageImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/Webapp25PackageImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WelcomeFileListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WelcomeFileListTypeImpl.java
index 85dd73e51..85dd73e51 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/WelcomeFileListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/WelcomeFileListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdAnyURITypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdAnyURITypeImpl.java
index 36602ff36..36602ff36 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdAnyURITypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdAnyURITypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdBooleanTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdBooleanTypeImpl.java
index 7aee319e4..7aee319e4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdIntegerTypeImpl.java
index 59c45fc30..59c45fc30 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNMTOKENTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNMTOKENTypeImpl.java
index 1013c8cb0..1013c8cb0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNMTOKENTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNMTOKENTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNonNegativeIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNonNegativeIntegerTypeImpl.java
index af141cf7e..af141cf7e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNonNegativeIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdNonNegativeIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdPositiveIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdPositiveIntegerTypeImpl.java
index 2047be662..2047be662 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdPositiveIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdPositiveIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdQNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdQNameTypeImpl.java
index e07527838..e07527838 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdQNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdQNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdStringTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdStringTypeImpl.java
index ef3157e09..ef3157e09 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/impl/XsdStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25AdapterFactory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25AdapterFactory.java
index 39a105997..39a105997 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25AdapterFactory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceFactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceFactoryImpl.java
index a97d95d04..a97d95d04 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceImpl.java
index 66bfb70da..66bfb70da 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Switch.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Switch.java
index 313d40931..313d40931 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Switch.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Switch.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Validator.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Validator.java
index e2a982e36..e2a982e36 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Validator.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25Validator.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25XMLProcessor.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25XMLProcessor.java
index 46a9b54e8..46a9b54e8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25XMLProcessor.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp25/util/Webapp25XMLProcessor.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AbsoluteOrderingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AbsoluteOrderingType.java
index a995b4aa7..a995b4aa7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AbsoluteOrderingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AbsoluteOrderingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesType.java
index 7f4a05f8a..7f4a05f8a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesTypeBase.java
index 7e965846c..7e965846c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AddressingResponsesTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AddressingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AddressingType.java
index 95c7ca4aa..95c7ca4aa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AddressingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AddressingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AuthConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AuthConstraintType.java
index ab2fb10d1..ab2fb10d1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AuthConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AuthConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AuthMethodType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AuthMethodType.java
index d55d7ffcf..d55d7ffcf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/AuthMethodType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/AuthMethodType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieCommentType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieCommentType.java
index 1818419a5..1818419a5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieCommentType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieCommentType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieConfigType.java
index e448f20cf..e448f20cf 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieDomainType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieDomainType.java
index 7fe6295d4..7fe6295d4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieDomainType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieDomainType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieNameType.java
index 6d0f7a0d6..6d0f7a0d6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookieNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookieNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookiePathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookiePathType.java
index 7db6f8e94..7db6f8e94 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/CookiePathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/CookiePathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DataSourceType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DataSourceType.java
index 13b67a9f6..13b67a9f6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DataSourceType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DataSourceType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DescriptionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DescriptionType.java
index acf639805..acf639805 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DescriptionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DescriptionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DispatcherType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DispatcherType.java
index 2127bec04..2127bec04 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DispatcherType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DispatcherType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DispatcherTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DispatcherTypeBase.java
index 363eecf16..363eecf16 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DispatcherTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DispatcherTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DisplayNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DisplayNameType.java
index e489991e4..e489991e4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DisplayNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DisplayNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DocumentRoot.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DocumentRoot.java
index f6a97065e..f6a97065e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/DocumentRoot.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/DocumentRoot.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbLinkType.java
index 5eaddd574..5eaddd574 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbLocalRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbLocalRefType.java
index 8c9c99a32..8c9c99a32 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbLocalRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbLocalRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefNameType.java
index 7314b49b9..7314b49b9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefType.java
index 0509173a4..0509173a4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeType.java
index 61795ee9d..61795ee9d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeTypeBase.java
index 09f3b9e4b..09f3b9e4b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EjbRefTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EmptyType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EmptyType.java
index 089f3ef8a..089f3ef8a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EmptyType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EmptyType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryType.java
index eae3e85ac..eae3e85ac 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryTypeValuesType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryTypeValuesType.java
index d873e4f7d..d873e4f7d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryTypeValuesType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/EnvEntryTypeValuesType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ErrorCodeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ErrorCodeType.java
index e3118cdc2..e3118cdc2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ErrorCodeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ErrorCodeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ErrorPageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ErrorPageType.java
index ee6b465e2..ee6b465e2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ErrorPageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ErrorPageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FilterMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FilterMappingType.java
index 17f517ac2..17f517ac2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FilterMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FilterMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FilterNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FilterNameType.java
index fe2e036e7..fe2e036e7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FilterNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FilterNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FilterType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FilterType.java
index 09674f5c9..09674f5c9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FilterType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FilterType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FormLoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FormLoginConfigType.java
index f99be1857..f99be1857 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FormLoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FormLoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FullyQualifiedClassType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FullyQualifiedClassType.java
index dedc63b17..dedc63b17 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/FullyQualifiedClassType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/FullyQualifiedClassType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanType.java
index e83970ad7..e83970ad7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanTypeBase.java
index a1b72bba1..a1b72bba1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/GenericBooleanTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainType.java
index 031114829..031114829 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainsType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainsType.java
index 06c3ea74b..06c3ea74b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainsType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HandlerChainsType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HandlerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HandlerType.java
index fed881e24..fed881e24 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HandlerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HandlerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HomeType.java
index 5d75d59e5..5d75d59e5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/HomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/HomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/IconType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/IconType.java
index b2e51f051..b2e51f051 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/IconType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/IconType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/InjectionTargetType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/InjectionTargetType.java
index c5960f224..c5960f224 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/InjectionTargetType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/InjectionTargetType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/IsolationLevelType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/IsolationLevelType.java
index 3a30ca253..3a30ca253 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/IsolationLevelType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/IsolationLevelType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JavaIdentifierType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JavaIdentifierType.java
index 1a6263307..1a6263307 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JavaIdentifierType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JavaIdentifierType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JavaTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JavaTypeType.java
index 207601018..207601018 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JavaTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JavaTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JdbcUrlType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JdbcUrlType.java
index 770d01107..770d01107 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JdbcUrlType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JdbcUrlType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JndiNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JndiNameType.java
index 62fbc8674..62fbc8674 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JndiNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JndiNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JspConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JspConfigType.java
index fe9f03545..fe9f03545 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JspConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JspConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JspFileType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JspFileType.java
index 3969a6f09..3969a6f09 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JspFileType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JspFileType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JspPropertyGroupType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JspPropertyGroupType.java
index 7ee0daa94..7ee0daa94 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/JspPropertyGroupType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/JspPropertyGroupType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LifecycleCallbackType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LifecycleCallbackType.java
index 20d718a2a..20d718a2a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LifecycleCallbackType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LifecycleCallbackType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ListenerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ListenerType.java
index e3fce33b3..e3fce33b3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ListenerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ListenerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocalHomeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocalHomeType.java
index 1a29d655d..1a29d655d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocalHomeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocalHomeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocalType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocalType.java
index fdd5ddf0a..fdd5ddf0a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocalType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocalType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingListType.java
index ef16f28ed..ef16f28ed 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingType.java
index 3b2d7b245..3b2d7b245 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LocaleEncodingMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LoginConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LoginConfigType.java
index cd13659f5..cd13659f5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/LoginConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/LoginConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationLinkType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationLinkType.java
index 6547c77d3..6547c77d3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationLinkType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationLinkType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationRefType.java
index 9785b155d..9785b155d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationType.java
index 50717297d..50717297d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationTypeType.java
index 58dc3c4a9..58dc3c4a9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageType.java
index 1a843bb42..1a843bb42 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageTypeBase.java
index ffcf86204..ffcf86204 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MessageDestinationUsageTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MimeMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MimeMappingType.java
index 4e4b6b3ad..4e4b6b3ad 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MimeMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MimeMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MimeTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MimeTypeType.java
index 5bc428566..5bc428566 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MimeTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MimeTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MultipartConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MultipartConfigType.java
index 5a75c8108..5a75c8108 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/MultipartConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/MultipartConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/NonEmptyStringType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/NonEmptyStringType.java
index b6fd32a6f..b6fd32a6f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/NonEmptyStringType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/NonEmptyStringType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/NullCharType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/NullCharType.java
index 7325e5f00..7325e5f00 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/NullCharType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/NullCharType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/OrderingOrderingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/OrderingOrderingType.java
index 34e20220d..34e20220d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/OrderingOrderingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/OrderingOrderingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/OrderingOthersType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/OrderingOthersType.java
index f5a63e765..f5a63e765 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/OrderingOthersType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/OrderingOthersType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/OrderingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/OrderingType.java
index 24947814c..24947814c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/OrderingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/OrderingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ParamValueType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ParamValueType.java
index 114ddaacd..114ddaacd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ParamValueType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ParamValueType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PathType.java
index d0510fc73..d0510fc73 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextRefType.java
index 978674a3a..978674a3a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeType.java
index 185821bb3..185821bb3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeTypeBase.java
index 5dbda3751..5dbda3751 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceContextTypeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceUnitRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceUnitRefType.java
index 980425dc0..980425dc0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PersistenceUnitRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PersistenceUnitRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PortComponentRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PortComponentRefType.java
index 2ac46e6a6..2ac46e6a6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PortComponentRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PortComponentRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PropertyType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PropertyType.java
index b65b8aaa3..b65b8aaa3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/PropertyType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/PropertyType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RemoteType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RemoteType.java
index 91ce77e05..91ce77e05 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RemoteType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RemoteType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResAuthType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResAuthType.java
index fae068d75..fae068d75 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResAuthType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResAuthType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResAuthTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResAuthTypeBase.java
index c15eb41c2..c15eb41c2 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResAuthTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResAuthTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeType.java
index e20306413..e20306413 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeTypeBase.java
index cee26245c..cee26245c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResSharingScopeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResourceEnvRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResourceEnvRefType.java
index 01f16af28..01f16af28 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResourceEnvRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResourceEnvRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResourceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResourceRefType.java
index 182a430ae..182a430ae 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ResourceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ResourceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RespectBindingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RespectBindingType.java
index dc094c134..dc094c134 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RespectBindingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RespectBindingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RoleNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RoleNameType.java
index 1cc82fdda..1cc82fdda 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RoleNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RoleNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RunAsType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RunAsType.java
index 194df4a03..194df4a03 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/RunAsType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/RunAsType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SecurityConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SecurityConstraintType.java
index d55d1fc6a..d55d1fc6a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SecurityConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SecurityConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleRefType.java
index 3fdbf0a29..3fdbf0a29 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleType.java
index 25fc9d3b1..25fc9d3b1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SecurityRoleType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServiceRefType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServiceRefType.java
index d19b3045e..d19b3045e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServiceRefType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServiceRefType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServletMappingType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServletMappingType.java
index 9ceefa68b..9ceefa68b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServletMappingType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServletMappingType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServletNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServletNameType.java
index 467b6cfd1..467b6cfd1 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServletNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServletNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServletType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServletType.java
index c1064acc7..c1064acc7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/ServletType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/ServletType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SessionConfigType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SessionConfigType.java
index 26178d6ec..26178d6ec 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/SessionConfigType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/SessionConfigType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/String.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/String.java
index 8eb5bf82c..8eb5bf82c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/String.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/String.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TaglibType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TaglibType.java
index 76f3f5248..76f3f5248 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TaglibType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TaglibType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeType.java
index db9896186..db9896186 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeTypeBase.java
index 21635ebbb..21635ebbb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TrackingModeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeType.java
index 444addd69..444addd69 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeTypeBase.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeTypeBase.java
index a0b4a5db7..a0b4a5db7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeTypeBase.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TransportGuaranteeTypeBase.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TrueFalseType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TrueFalseType.java
index c70511cb7..c70511cb7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/TrueFalseType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/TrueFalseType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/UrlPatternType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/UrlPatternType.java
index d2ba299c4..d2ba299c4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/UrlPatternType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/UrlPatternType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/UserDataConstraintType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/UserDataConstraintType.java
index 243862585..243862585 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/UserDataConstraintType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/UserDataConstraintType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WarPathType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WarPathType.java
index e8af841e7..e8af841e7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WarPathType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WarPathType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebAppType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebAppType.java
index eb0a6828c..eb0a6828c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebAppType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebAppType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebAppVersionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebAppVersionType.java
index 730529a1a..730529a1a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebAppVersionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebAppVersionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebFragmentType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebFragmentType.java
index bd27f8a43..bd27f8a43 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebFragmentType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebFragmentType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebResourceCollectionType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebResourceCollectionType.java
index 094d14795..094d14795 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WebResourceCollectionType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WebResourceCollectionType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Factory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Factory.java
index aa74e6e3c..aa74e6e3c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Factory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Factory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Package.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Package.java
index e90835583..e90835583 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Package.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/Webapp30Package.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WelcomeFileListType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WelcomeFileListType.java
index 534833470..534833470 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/WelcomeFileListType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/WelcomeFileListType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdAnyURIType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdAnyURIType.java
index 99a5ddfbd..99a5ddfbd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdAnyURIType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdAnyURIType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdBooleanType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdBooleanType.java
index 20d9dcccc..20d9dcccc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdBooleanType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdBooleanType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdIntegerType.java
index 31e581fd5..31e581fd5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdNMTOKENType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdNMTOKENType.java
index ce87b2745..ce87b2745 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdNMTOKENType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdNMTOKENType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdNonNegativeIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdNonNegativeIntegerType.java
index d38bf423c..d38bf423c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdNonNegativeIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdNonNegativeIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdPositiveIntegerType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdPositiveIntegerType.java
index 8ab5e4aa5..8ab5e4aa5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdPositiveIntegerType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdPositiveIntegerType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdQNameType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdQNameType.java
index c866cb141..c866cb141 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdQNameType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdQNameType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdStringType.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdStringType.java
index 27d0467b7..27d0467b7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/XsdStringType.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/XsdStringType.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AbsoluteOrderingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AbsoluteOrderingTypeImpl.java
index f4ad9b4fa..f4ad9b4fa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AbsoluteOrderingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AbsoluteOrderingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingResponsesTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingResponsesTypeImpl.java
index 31e8cb4f7..31e8cb4f7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingResponsesTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingResponsesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingTypeImpl.java
index 33dbe1fca..33dbe1fca 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AddressingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthConstraintTypeImpl.java
index 3cdac164a..3cdac164a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthMethodTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthMethodTypeImpl.java
index 79b5cbeee..79b5cbeee 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthMethodTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/AuthMethodTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieCommentTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieCommentTypeImpl.java
index 6a10c66c7..6a10c66c7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieCommentTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieCommentTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieConfigTypeImpl.java
index c9ede66f9..c9ede66f9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieDomainTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieDomainTypeImpl.java
index 0f665d619..0f665d619 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieDomainTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieDomainTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieNameTypeImpl.java
index 1f9eb9479..1f9eb9479 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookieNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookiePathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookiePathTypeImpl.java
index f25652707..f25652707 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/CookiePathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/CookiePathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DataSourceTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DataSourceTypeImpl.java
index 815d84ce5..815d84ce5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DataSourceTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DataSourceTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DescriptionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DescriptionTypeImpl.java
index ccd35c029..ccd35c029 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DescriptionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DescriptionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DispatcherTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DispatcherTypeImpl.java
index d9b1408e8..d9b1408e8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DispatcherTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DispatcherTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DisplayNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DisplayNameTypeImpl.java
index 8a45c4fc5..8a45c4fc5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DisplayNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DisplayNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DocumentRootImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DocumentRootImpl.java
index c1469842c..c1469842c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/DocumentRootImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/DocumentRootImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLinkTypeImpl.java
index 5afaac968..5afaac968 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLocalRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLocalRefTypeImpl.java
index 41cabc91e..41cabc91e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLocalRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbLocalRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefNameTypeImpl.java
index f2eb6aa46..f2eb6aa46 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeImpl.java
index 4e603019e..4e603019e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeTypeImpl.java
index 9dfa29020..9dfa29020 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EjbRefTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EmptyTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EmptyTypeImpl.java
index c33ea6aae..c33ea6aae 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EmptyTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EmptyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeImpl.java
index 350fe6cae..350fe6cae 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeValuesTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeValuesTypeImpl.java
index a92df6587..a92df6587 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeValuesTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/EnvEntryTypeValuesTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorCodeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorCodeTypeImpl.java
index 7638fd1a8..7638fd1a8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorCodeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorCodeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorPageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorPageTypeImpl.java
index 1e3929182..1e3929182 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorPageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ErrorPageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterMappingTypeImpl.java
index f18bc7169..f18bc7169 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterNameTypeImpl.java
index 0b2d853cc..0b2d853cc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterTypeImpl.java
index 33b56772f..33b56772f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FilterTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FormLoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FormLoginConfigTypeImpl.java
index 87d2c9b80..87d2c9b80 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FormLoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FormLoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FullyQualifiedClassTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FullyQualifiedClassTypeImpl.java
index 9f2364f76..9f2364f76 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/FullyQualifiedClassTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/FullyQualifiedClassTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/GenericBooleanTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/GenericBooleanTypeImpl.java
index 19de5b06b..19de5b06b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/GenericBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/GenericBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainTypeImpl.java
index bc82519f7..bc82519f7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainsTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainsTypeImpl.java
index 4de119790..4de119790 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainsTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerChainsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerTypeImpl.java
index 0c342fe18..0c342fe18 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HandlerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HomeTypeImpl.java
index 45fbd9d47..45fbd9d47 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/HomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/HomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/IconTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/IconTypeImpl.java
index aca16ab29..aca16ab29 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/IconTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/IconTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/InjectionTargetTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/InjectionTargetTypeImpl.java
index 795a1abc4..795a1abc4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/InjectionTargetTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/InjectionTargetTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaIdentifierTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaIdentifierTypeImpl.java
index 25d3b5008..25d3b5008 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaIdentifierTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaIdentifierTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaTypeTypeImpl.java
index db3e869d5..db3e869d5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JavaTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JdbcUrlTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JdbcUrlTypeImpl.java
index b7e2c4977..b7e2c4977 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JdbcUrlTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JdbcUrlTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JndiNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JndiNameTypeImpl.java
index a08ddd64f..a08ddd64f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JndiNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JndiNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JspConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JspConfigTypeImpl.java
index 6bbbc72f9..6bbbc72f9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JspConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JspConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JspFileTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JspFileTypeImpl.java
index e76e2372d..e76e2372d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JspFileTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JspFileTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JspPropertyGroupTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JspPropertyGroupTypeImpl.java
index 20735efb0..20735efb0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/JspPropertyGroupTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/JspPropertyGroupTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LifecycleCallbackTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LifecycleCallbackTypeImpl.java
index 0477eca3b..0477eca3b 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LifecycleCallbackTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LifecycleCallbackTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ListenerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ListenerTypeImpl.java
index b22130438..b22130438 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ListenerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ListenerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalHomeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalHomeTypeImpl.java
index d84b9e00d..d84b9e00d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalHomeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalHomeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalTypeImpl.java
index 835fc44d8..835fc44d8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocalTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingListTypeImpl.java
index 11536999d..11536999d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingTypeImpl.java
index 0f5ad2fd3..0f5ad2fd3 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LocaleEncodingMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LoginConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LoginConfigTypeImpl.java
index b34d4da01..b34d4da01 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/LoginConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/LoginConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationLinkTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationLinkTypeImpl.java
index a8020b42d..a8020b42d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationLinkTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationLinkTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationRefTypeImpl.java
index c89214a79..c89214a79 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeImpl.java
index e1a488ea0..e1a488ea0 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeTypeImpl.java
index 807e7e6e9..807e7e6e9 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationUsageTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationUsageTypeImpl.java
index 0c54e4d17..0c54e4d17 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationUsageTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MessageDestinationUsageTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeMappingTypeImpl.java
index f3e473eea..f3e473eea 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeTypeTypeImpl.java
index 9bf265ca5..9bf265ca5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MimeTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MultipartConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MultipartConfigTypeImpl.java
index fe166a286..fe166a286 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/MultipartConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/MultipartConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/NonEmptyStringTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/NonEmptyStringTypeImpl.java
index 50fe61f29..50fe61f29 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/NonEmptyStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/NonEmptyStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOrderingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOrderingTypeImpl.java
index 05e5aeaf8..05e5aeaf8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOrderingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOrderingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOthersTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOthersTypeImpl.java
index fb90ba8cb..fb90ba8cb 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOthersTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingOthersTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingTypeImpl.java
index aac7b92cc..aac7b92cc 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/OrderingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ParamValueTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ParamValueTypeImpl.java
index b97ecc77d..b97ecc77d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ParamValueTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ParamValueTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PathTypeImpl.java
index e0aca11ab..e0aca11ab 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextRefTypeImpl.java
index 0241a1103..0241a1103 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextTypeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextTypeTypeImpl.java
index aeeb0d662..aeeb0d662 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextTypeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceContextTypeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceUnitRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceUnitRefTypeImpl.java
index 43f616570..43f616570 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceUnitRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PersistenceUnitRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PortComponentRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PortComponentRefTypeImpl.java
index 1a6ef621d..1a6ef621d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PortComponentRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PortComponentRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PropertyTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PropertyTypeImpl.java
index 0a18e0e45..0a18e0e45 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/PropertyTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/PropertyTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RemoteTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RemoteTypeImpl.java
index 784c29e0d..784c29e0d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RemoteTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RemoteTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResAuthTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResAuthTypeImpl.java
index 4918b36db..4918b36db 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResAuthTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResAuthTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResSharingScopeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResSharingScopeTypeImpl.java
index 11724d68a..11724d68a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResSharingScopeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResSharingScopeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceEnvRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceEnvRefTypeImpl.java
index 882605c65..882605c65 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceEnvRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceEnvRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceRefTypeImpl.java
index 753ceef5c..753ceef5c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ResourceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RespectBindingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RespectBindingTypeImpl.java
index 0a8b23909..0a8b23909 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RespectBindingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RespectBindingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RoleNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RoleNameTypeImpl.java
index f4b9b8390..f4b9b8390 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RoleNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RoleNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RunAsTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RunAsTypeImpl.java
index 2b6d31732..2b6d31732 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/RunAsTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/RunAsTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityConstraintTypeImpl.java
index b19ec2c3f..b19ec2c3f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleRefTypeImpl.java
index bb5310fc6..bb5310fc6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleTypeImpl.java
index 0507015e7..0507015e7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SecurityRoleTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServiceRefTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServiceRefTypeImpl.java
index d9b11770c..d9b11770c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServiceRefTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServiceRefTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletMappingTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletMappingTypeImpl.java
index 86d8c8bbd..86d8c8bbd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletMappingTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletMappingTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletNameTypeImpl.java
index cec8525a4..cec8525a4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletTypeImpl.java
index 7d239c049..7d239c049 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/ServletTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SessionConfigTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SessionConfigTypeImpl.java
index 8ad0745dd..8ad0745dd 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/SessionConfigTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/SessionConfigTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/StringImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/StringImpl.java
index 9293f567e..9293f567e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/StringImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/StringImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TaglibTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TaglibTypeImpl.java
index 3dff59021..3dff59021 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TaglibTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TaglibTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TrackingModeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TrackingModeTypeImpl.java
index 02bda9faa..02bda9faa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TrackingModeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TrackingModeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TransportGuaranteeTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TransportGuaranteeTypeImpl.java
index 8b2d341f4..8b2d341f4 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TransportGuaranteeTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TransportGuaranteeTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TrueFalseTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TrueFalseTypeImpl.java
index 9bc1e9e15..9bc1e9e15 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/TrueFalseTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/TrueFalseTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/UrlPatternTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/UrlPatternTypeImpl.java
index d066b595c..d066b595c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/UrlPatternTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/UrlPatternTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/UserDataConstraintTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/UserDataConstraintTypeImpl.java
index 6404d63aa..6404d63aa 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/UserDataConstraintTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/UserDataConstraintTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WarPathTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WarPathTypeImpl.java
index 2d32d62e7..2d32d62e7 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WarPathTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WarPathTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WebAppTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WebAppTypeImpl.java
index b6123f15e..b6123f15e 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WebAppTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WebAppTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WebFragmentTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WebFragmentTypeImpl.java
index 15523d8f5..15523d8f5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WebFragmentTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WebFragmentTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WebResourceCollectionTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WebResourceCollectionTypeImpl.java
index a3460e869..a3460e869 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WebResourceCollectionTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WebResourceCollectionTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30FactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30FactoryImpl.java
index e2a462a92..e2a462a92 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30FactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30FactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30PackageImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30PackageImpl.java
index 9c20764ff..9c20764ff 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30PackageImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/Webapp30PackageImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WelcomeFileListTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WelcomeFileListTypeImpl.java
index 439a6b338..439a6b338 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/WelcomeFileListTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/WelcomeFileListTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdAnyURITypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdAnyURITypeImpl.java
index a270d3be8..a270d3be8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdAnyURITypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdAnyURITypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdBooleanTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdBooleanTypeImpl.java
index ffd34b36c..ffd34b36c 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdBooleanTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdBooleanTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdIntegerTypeImpl.java
index b1381f52a..b1381f52a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNMTOKENTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNMTOKENTypeImpl.java
index e596d9f7d..e596d9f7d 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNMTOKENTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNMTOKENTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNonNegativeIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNonNegativeIntegerTypeImpl.java
index 191966065..191966065 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNonNegativeIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdNonNegativeIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdPositiveIntegerTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdPositiveIntegerTypeImpl.java
index 55b81b7f5..55b81b7f5 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdPositiveIntegerTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdPositiveIntegerTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdQNameTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdQNameTypeImpl.java
index 1486bd0f8..1486bd0f8 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdQNameTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdQNameTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdStringTypeImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdStringTypeImpl.java
index 65708b1ae..65708b1ae 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdStringTypeImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/XsdStringTypeImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/webapp30.ecore b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/webapp30.ecore
index fd4822c8f..fd4822c8f 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/impl/webapp30.ecore
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/impl/webapp30.ecore
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30AdapterFactory.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30AdapterFactory.java
index 3ae35fd11..3ae35fd11 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30AdapterFactory.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30AdapterFactory.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceFactoryImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceFactoryImpl.java
index 67a7d48c6..67a7d48c6 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceFactoryImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceFactoryImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceImpl.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceImpl.java
index 31599f14a..31599f14a 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceImpl.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30ResourceImpl.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Switch.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Switch.java
index 0b3d14ded..0b3d14ded 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Switch.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Switch.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Validator.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Validator.java
index 2c6ee3606..2c6ee3606 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Validator.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30Validator.java
diff --git a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30XMLProcessor.java b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30XMLProcessor.java
index 907234255..907234255 100644
--- a/org.eclipse.modisco.jee.webapp/src/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30XMLProcessor.java
+++ b/org.eclipse.modisco.jee.webapp/src-gen/org/eclipse/modisco/jee/webapp/webapp30/util/Webapp30XMLProcessor.java
diff --git a/org.eclipse.modisco.jee/.checkstyle b/org.eclipse.modisco.jee/.checkstyle
index 349754695..5c97ead4f 100644
--- a/org.eclipse.modisco.jee/.checkstyle
+++ b/org.eclipse.modisco.jee/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="Local" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="Local" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="Local" local="true">
diff --git a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/AbstractDeploymentDescriptorDiscoverer.java b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/AbstractDeploymentDescriptorDiscoverer.java
index fc15f424a..ce57058f8 100644
--- a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/AbstractDeploymentDescriptorDiscoverer.java
+++ b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/AbstractDeploymentDescriptorDiscoverer.java
@@ -4,7 +4,7 @@
  * 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:

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation (class previously named DeploymentDescriptorDiscoverer)

  *    Nicolas Bros (Mia-Software) - refactoring for new discovery framework

@@ -37,7 +37,7 @@ public abstract class AbstractDeploymentDescriptorDiscoverer<T> extends Abstract
 

 	/**

 	 * Determine which version of DTD/XSD is used in the .xml file

-	 * 

+	 *

 	 * @param source

 	 * @return the version of the .xml file

 	 */

@@ -121,7 +121,7 @@ public abstract class AbstractDeploymentDescriptorDiscoverer<T> extends Abstract
 				// if no "version" attribute present, look for the xsd

 				// declaration

 			} else if (!doc.getDocumentElement()

-					.getAttribute("xsi:schemaLocation").toString().equalsIgnoreCase("")) { //$NON-NLS-1$ //$NON-NLS-2$			

+					.getAttribute("xsi:schemaLocation").toString().equalsIgnoreCase("")) { //$NON-NLS-1$ //$NON-NLS-2$

 				String schemaLocation = doc.getDocumentElement().getAttribute("xsi:schemaLocation"); //$NON-NLS-1$

 

 				if (schemaLocation.contains(rootName)) {

@@ -157,15 +157,15 @@ public abstract class AbstractDeploymentDescriptorDiscoverer<T> extends Abstract
 	/**

 	 * Look for a DOCTYPE declaration, then a dtd one. Assume that the right DTD is declared right

 	 * after the DOCTYPE

-	 * 

+	 *

 	 * @param file

 	 * @return the version of the hibernate-configuration.xml file

 	 */

 	public static String getDoctypeVersion(final Plugin plugin, final Object source,

 			final String rootName, final String baseUrl) {

 		String version = ""; //$NON-NLS-1$

-		String docType = "DOCTYPE"; //$NON-NLS-1$	

-		String dtdFileExtension = ".dtd"; //$NON-NLS-1$	

+		String docType = "DOCTYPE"; //$NON-NLS-1$

+		String dtdFileExtension = ".dtd"; //$NON-NLS-1$

 

 		// Number of line used to create a single String

 		final int dtdDeclarationSize = 5;

diff --git a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java
index fb313d47c..dc255ab2d 100644
--- a/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java
+++ b/org.eclipse.modisco.jee/src/org/eclipse/modisco/jee/actions/Messages.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  * 	   Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  */

diff --git a/org.eclipse.modisco.kdm.source.discoverer.ui/.checkstyle b/org.eclipse.modisco.kdm.source.discoverer.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.kdm.source.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.kdm.source.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.kdm.source.discoverer.ui/src/org/eclipse/modisco/kdm/source/discoverer/ui/internal/Activator.java b/org.eclipse.modisco.kdm.source.discoverer.ui/src/org/eclipse/modisco/kdm/source/discoverer/ui/internal/Activator.java
index aa2ed8424..c851ecfd4 100644
--- a/org.eclipse.modisco.kdm.source.discoverer.ui/src/org/eclipse/modisco/kdm/source/discoverer/ui/internal/Activator.java
+++ b/org.eclipse.modisco.kdm.source.discoverer.ui/src/org/eclipse/modisco/kdm/source/discoverer/ui/internal/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.kdm.source.discoverer/.checkstyle b/org.eclipse.modisco.kdm.source.discoverer/.checkstyle
index a275c803f..ccd57eb46 100644
--- a/org.eclipse.modisco.kdm.source.discoverer/.checkstyle
+++ b/org.eclipse.modisco.kdm.source.discoverer/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/IKDMDiscoveryConstants.java b/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/IKDMDiscoveryConstants.java
index 397bb390a..616bdb149 100644
--- a/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/IKDMDiscoveryConstants.java
+++ b/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/IKDMDiscoveryConstants.java
@@ -7,7 +7,7 @@
  *
  * Contributors:
  *     Nicolas Bros (Mia-Software) - initial API and implementation
- *     Fabien Giquel (Mia-Software) - 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework 
+ *     Fabien Giquel (Mia-Software) - 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework
  *******************************************************************************/
 package org.eclipse.modisco.kdm.source.discoverer;
 
diff --git a/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/Activator.java b/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/Activator.java
index a5f4bf522..2d26c2162 100644
--- a/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/Activator.java
+++ b/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/Activator.java
@@ -26,7 +26,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.osgi.framework.BundleActivator#start(org.osgi.framework.BundleContext

 	 * )

@@ -40,7 +40,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.osgi.framework.BundleActivator#stop(org.osgi.framework.BundleContext)

 	 */

diff --git a/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/KDMSourceDiscoverer.java b/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/KDMSourceDiscoverer.java
index 4f58a2674..f00de1cf7 100644
--- a/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/KDMSourceDiscoverer.java
+++ b/org.eclipse.modisco.kdm.source.discoverer/src/org/eclipse/modisco/kdm/source/discoverer/internal/KDMSourceDiscoverer.java
@@ -89,7 +89,7 @@ public class KDMSourceDiscoverer {
 

 	/**

 	 * Create a new File system representation for the given File.

-	 * 

+	 *

 	 * @param file

 	 *            must be a directory

 	 * @return the resource containing the representation

@@ -105,7 +105,7 @@ public class KDMSourceDiscoverer {
 

 	/**

 	 * Create a new File system representation for the given project.

-	 * 

+	 *

 	 * @param project

 	 *            a project

 	 * @return the resource containing the representation

@@ -118,7 +118,7 @@ public class KDMSourceDiscoverer {
 

 	/**

 	 * Create a new File system representation for the given Eclipse container.

-	 * 

+	 *

 	 * @param aContainer

 	 *            a Eclipse container

 	 * @return the resource containing the representation

@@ -131,7 +131,7 @@ public class KDMSourceDiscoverer {
 

 	/**

 	 * Create a new File system representation for the given directory.

-	 * 

+	 *

 	 * @param directoryFile

 	 *            a directory

 	 * @param name

@@ -155,7 +155,7 @@ public class KDMSourceDiscoverer {
 

 	/**

 	 * Create a new File system representation for the given directory.

-	 * 

+	 *

 	 * @param directory

 	 *            a directory

 	 * @return the inventory container

@@ -193,7 +193,7 @@ public class KDMSourceDiscoverer {
 	 * Between multiple content types for the file, search for the most

 	 * specialized defined in this plug-in, or <code>null</code> if no content

 	 * type is associated with this file in this plug-in.

-	 * 

+	 *

 	 * @param fileName

 	 *            the file name

 	 * @return the more specialized content type defined in this plug-in

@@ -216,7 +216,7 @@ public class KDMSourceDiscoverer {
 

 	/**

 	 * Create the Inventory Item corresponding to the given file's content type.

-	 * 

+	 *

 	 * @param file

 	 *            the file

 	 * @return the inventory item

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/.checkstyle b/org.eclipse.modisco.kdm.source.extension.ui/.checkstyle
index b5f41d501..2c05eb542 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/.checkstyle
+++ b/org.eclipse.modisco.kdm.source.extension.ui/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

  <fileset-config file-format-version="1.2.0" simple-config="true">

-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">

      <file-match-pattern match-pattern="." include-pattern="true"/>

      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/Activator.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/Activator.java
index 9624d3492..70f11a92c 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/Activator.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/Activator.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -37,7 +37,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -63,7 +63,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/actions/ActionBrowseCodeInTextEditor.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/actions/ActionBrowseCodeInTextEditor.java
index f1e9d96da..0010f2850 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/actions/ActionBrowseCodeInTextEditor.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/actions/ActionBrowseCodeInTextEditor.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapter.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapter.java
index bf42e969c..816a6b61f 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapter.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapter.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -30,7 +30,7 @@ import org.eclipse.modisco.kdm.source.extension.ui.utils.Utils;
 /**

  * A new instance of this class is added to every eObject we want to synchronize

  * with its source code

- * 

+ *

  */

 public class SourceAccessAdapter extends AdapterImpl {

 

@@ -59,7 +59,7 @@ public class SourceAccessAdapter extends AdapterImpl {
 

 	/**

 	 * Return the {@link SourceStrategy}

-	 * 

+	 *

 	 * @return the {@link SourceStrategy}

 	 */

 	public SourceStrategy getStrategySource() {

@@ -71,7 +71,7 @@ public class SourceAccessAdapter extends AdapterImpl {
 

 	/**

 	 * Return the {@link RevealingStrategy}

-	 * 

+	 *

 	 * @return the {@link RevealingStrategy}

 	 */

 	public RevealingStrategy getStrategyRevealing() {

@@ -83,7 +83,7 @@ public class SourceAccessAdapter extends AdapterImpl {
 

 	/**

 	 * Call the {@link SourceStrategy} to get the {@link ASTNodeSourceRegion}

-	 * 

+	 *

 	 * @param eObject

 	 * @return

 	 */

@@ -103,7 +103,7 @@ public class SourceAccessAdapter extends AdapterImpl {
 

 	/**

 	 * Set the {@link SourceRegion}

-	 * 

+	 *

 	 * @param sourceRegion

 	 */

 	public void setSourceRegion(final SourceRegion sourceRegion) {

@@ -113,7 +113,7 @@ public class SourceAccessAdapter extends AdapterImpl {
 	/**

 	 * Call the {@link RevealingStrategy} to reveal the selected element in its

 	 * opened editor

-	 * 

+	 *

 	 * @param sourceRegion

 	 * @param eObject

 	 */

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapterFactory.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapterFactory.java
index 16ac01025..f726f1510 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapterFactory.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/adapters/SourceAccessAdapterFactory.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -62,7 +62,7 @@ public class SourceAccessAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Look for the extension point containing the registered

 	 * {@link SourceStrategy} extension

-	 * 

+	 *

 	 * @return

 	 */

 	protected static void initializeSourceStrategy() {

@@ -101,7 +101,7 @@ public class SourceAccessAdapterFactory extends AdapterFactoryImpl {
 	/**

 	 * Look for the extension point containing the registered

 	 * {@link RevealingStrategy} extension

-	 * 

+	 *

 	 * @return

 	 */

 	protected static void initializeRevealingStrategy() {

@@ -128,7 +128,7 @@ public class SourceAccessAdapterFactory extends AdapterFactoryImpl {
 			}

 		}

 	}

-	

+

 

 	private static RevealingStrategy findRevealingStrategy(final Notifier target) {

 		for (RevealingStrategy revealingStrategy : getRevealingStrategies()) {

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/RevealingStrategy.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/RevealingStrategy.java
index 19cae525e..5e383e141 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/RevealingStrategy.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/RevealingStrategy.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -24,7 +24,7 @@ public interface RevealingStrategy {
 	/**

 	 * Open the file in the right editor, then uses revealInTextEditor method to

 	 * select it

-	 * 

+	 *

 	 * @param file

 	 * @param sourceRegion

 	 */

@@ -33,7 +33,7 @@ public interface RevealingStrategy {
 

 	/**

 	 * Select the given soruceRegion in the given Editor

-	 * 

+	 *

 	 * @param iEditorPart

 	 *            a editor

 	 * @param sourceRegion

@@ -44,7 +44,7 @@ public interface RevealingStrategy {
 

 	/**

 	 * Return whether or not the revealing strategy is applicable to the EOBject

-	 * 

+	 *

 	 * @param eObject

 	 *            the EObject

 	 * @return boolean whether or not the revealing strategy is applicable to

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/SourceStrategy.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/SourceStrategy.java
index 1466f8a69..b3191d074 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/SourceStrategy.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/interfaces/SourceStrategy.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -22,7 +22,7 @@ public interface SourceStrategy {
 

 	/**

 	 * Return the ASTNodeSourceRegion corresponding to the EObject in parameter

-	 * 

+	 *

 	 * @param eObject

 	 *            the EObject from which we want the ASTNodeSourceRegion

 	 * @return the ASTNodeSourceRegion

@@ -31,7 +31,7 @@ public interface SourceStrategy {
 

 	/**

 	 * Return whether or not the source strategy is applicable to the EOBject

-	 * 

+	 *

 	 * @param eObject

 	 *            the EObject

 	 * @return boolean whether or not the source strategy is applicable to the

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/registry/EditorRegistry.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/registry/EditorRegistry.java
index 9ac548e53..30b6252a5 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/registry/EditorRegistry.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/registry/EditorRegistry.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/BrowseCodeUtils.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/BrowseCodeUtils.java
index 55649b145..6de3279a3 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/BrowseCodeUtils.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/BrowseCodeUtils.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -36,7 +36,7 @@ public final class BrowseCodeUtils {
 	/**

 	 * Add an adapter to the selection and try to open correponding file and

 	 * select the piece of code

-	 * 

+	 *

 	 * @param eObject

 	 *            the selected object to be opened

 	 */

diff --git a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/Utils.java b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/Utils.java
index e611fc343..a0e0d84df 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/Utils.java
+++ b/org.eclipse.modisco.kdm.source.extension.ui/src/org/eclipse/modisco/kdm/source/extension/ui/utils/Utils.java
@@ -5,9 +5,9 @@
  * 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:

- * 

+ *

  *    Nicolas Guyomar (Mia-Software) - initial API and implementation

  * *******************************************************************************

  *

@@ -24,7 +24,7 @@ public final class Utils {
 

 	/**

 	 * Return the File which contain the sourceRegion

-	 * 

+	 *

 	 * @param sourceRegion

 	 *            a sourceRegion we need to find an IFile for

 	 * @return

diff --git a/org.eclipse.modisco.kdm.source.extension/.checkstyle b/org.eclipse.modisco.kdm.source.extension/.checkstyle
index 52a6f574e..b035991f1 100644
--- a/org.eclipse.modisco.kdm.source.extension/.checkstyle
+++ b/org.eclipse.modisco.kdm.source.extension/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
@@ -9,9 +9,6 @@
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/kdm/source/extension"/>
-    <filter-data value="src/org/eclipse/modisco/kdm/source/extension/impl"/>
-    <filter-data value="src/org/eclipse/modisco/kdm/source/extension/util"/>
-    <filter-data value="&lt;recurse=false&gt;"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.kdm.source.extension/.classpath b/org.eclipse.modisco.kdm.source.extension/.classpath
index 45f024e85..e5fbd3dd2 100644
--- a/org.eclipse.modisco.kdm.source.extension/.classpath
+++ b/org.eclipse.modisco.kdm.source.extension/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.kdm.source.extension/build.properties b/org.eclipse.modisco.kdm.source.extension/build.properties
index 16bd7472f..7ede9108f 100644
--- a/org.eclipse.modisco.kdm.source.extension/build.properties
+++ b/org.eclipse.modisco.kdm.source.extension/build.properties
@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Nicolas Bros (Mia-Software) - initial API and implementation

+#	  Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 

 # <copyright>

@@ -21,6 +22,7 @@ bin.includes = .,\
                about.html,\

                OSGI-INF/

 jars.compile.order = .

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.kdm.source.extension/model/kdmSourceExtension.genmodel b/org.eclipse.modisco.kdm.source.extension/model/kdmSourceExtension.genmodel
index 36dc3150e..2d752222d 100644
--- a/org.eclipse.modisco.kdm.source.extension/model/kdmSourceExtension.genmodel
+++ b/org.eclipse.modisco.kdm.source.extension/model/kdmSourceExtension.genmodel
@@ -1,8 +1,8 @@
 <?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) 2010 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;*******************************************************************************"

-    modelDirectory="/org.eclipse.modisco.kdm.source.extension/src" modelPluginID="org.eclipse.modisco.kdm.source.extension"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA;Copyright (c) 2010, 2018 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;    Fabien Giquel (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;*******************************************************************************"

+    modelDirectory="/org.eclipse.modisco.kdm.source.extension/src-gen" modelPluginID="org.eclipse.modisco.kdm.source.extension"

     modelName="KdmSourceExtension" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" usedGenPackages="../../org.eclipse.gmt.modisco.omg.kdm/model/kdm.genmodel#//kdm">

   <foreignModel>kdmSourceExtension.ecore</foreignModel>

diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/ASTNodeSourceRegion.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/ASTNodeSourceRegion.java
index ef4356eb5..ef4356eb5 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/ASTNodeSourceRegion.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/ASTNodeSourceRegion.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/Activator.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/Activator.java
index fcd63922e..fcd63922e 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/Activator.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/Activator.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/CodeUnit2File.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/CodeUnit2File.java
index e3ba5cfe3..e3ba5cfe3 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/CodeUnit2File.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/CodeUnit2File.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/ExtensionFactory.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/ExtensionFactory.java
index 9f687ba82..9f687ba82 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/ExtensionFactory.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/ExtensionFactory.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/ExtensionPackage.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/ExtensionPackage.java
index 357d3a79d..357d3a79d 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/ExtensionPackage.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/ExtensionPackage.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/ASTNodeSourceRegionImpl.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/ASTNodeSourceRegionImpl.java
index b3a6a127a..b3a6a127a 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/ASTNodeSourceRegionImpl.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/ASTNodeSourceRegionImpl.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/CodeUnit2FileImpl.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/CodeUnit2FileImpl.java
index 8430a177d..8430a177d 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/CodeUnit2FileImpl.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/CodeUnit2FileImpl.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/ExtensionFactoryImpl.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/ExtensionFactoryImpl.java
index 85ad2a985..85ad2a985 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/ExtensionFactoryImpl.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/ExtensionFactoryImpl.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/ExtensionPackageImpl.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/ExtensionPackageImpl.java
index 4d62f2255..4d62f2255 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/impl/ExtensionPackageImpl.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/impl/ExtensionPackageImpl.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/util/ExtensionAdapterFactory.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/util/ExtensionAdapterFactory.java
index 65cc181aa..65cc181aa 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/util/ExtensionAdapterFactory.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/util/ExtensionAdapterFactory.java
diff --git a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/util/ExtensionSwitch.java b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/util/ExtensionSwitch.java
index ddd0f1705..ddd0f1705 100644
--- a/org.eclipse.modisco.kdm.source.extension/src/org/eclipse/modisco/kdm/source/extension/util/ExtensionSwitch.java
+++ b/org.eclipse.modisco.kdm.source.extension/src-gen/org/eclipse/modisco/kdm/source/extension/util/ExtensionSwitch.java
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/.checkstyle b/org.eclipse.modisco.kdm.uml2converter.tests/.checkstyle
index 2f3e8f52d..3d48bf31d 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/.checkstyle
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/.checkstyle
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="MoDisco" local="false">
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
 </fileset-config>
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/Activator.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/Activator.java
index 68cfbe520..4aef3a881 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/Activator.java
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/Activator.java
@@ -37,7 +37,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -63,7 +63,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java
index 65faceb35..75e274bf3 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2ConverterTest.java
@@ -231,7 +231,7 @@ public class KdmToUml2ConverterTest {
 		Assert.assertEquals(1, out.length);

 		Resource output = out[0];

 		Assert.assertNotNull(output);

-		

+

 		output.setURI(outputUri);

 		output.save(null);

 

diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
index 42bc0e8c7..d54d383f2 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/src/org/eclipse/modisco/kdm/uml2converter/tests/KdmToUml2WithTracesConverterTest.java
@@ -234,7 +234,7 @@ public class KdmToUml2WithTracesConverterTest {
 

 		output.setURI(outputUri);

 		output.save(null);

-		

+

 		return output;

 	}

 

diff --git a/org.eclipse.modisco.kdm.uml2converter.ui/.checkstyle b/org.eclipse.modisco.kdm.uml2converter.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.kdm.uml2converter.ui/.checkstyle
+++ b/org.eclipse.modisco.kdm.uml2converter.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Activator.java b/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Activator.java
index a7b93c21b..d4c7fb2f8 100644
--- a/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Activator.java
+++ b/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Messages.java b/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Messages.java
index 5a1e742d3..275e466bb 100644
--- a/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Messages.java
+++ b/org.eclipse.modisco.kdm.uml2converter.ui/src/org/eclipse/modisco/kdm/uml2converter/ui/internal/Messages.java
@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 /**

  * @author gdupe

- * 

+ *

  */

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.kdm.uml2converter.ui.internal.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.kdm.uml2converter/.checkstyle b/org.eclipse.modisco.kdm.uml2converter/.checkstyle
index daad76e6b..8bbb146e2 100644
--- a/org.eclipse.modisco.kdm.uml2converter/.checkstyle
+++ b/org.eclipse.modisco.kdm.uml2converter/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUml2Activator.java b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUml2Activator.java
index 03f4f5f83..5283e462b 100644
--- a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUml2Activator.java
+++ b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/KdmToUml2Activator.java
@@ -26,7 +26,7 @@ public class KdmToUml2Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -37,7 +37,7 @@ public class KdmToUml2Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)

 	 */

 	@Override

@@ -48,7 +48,7 @@ public class KdmToUml2Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static KdmToUml2Activator getDefault() {

@@ -57,7 +57,7 @@ public class KdmToUml2Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns an image descriptor for the image file at the given plug-in relative path

-	 * 

+	 *

 	 * @param path

 	 *            the path

 	 * @return the image descriptor

diff --git a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/Messages.java b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/Messages.java
index 912ff10fe..9112c5704 100644
--- a/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/Messages.java
+++ b/org.eclipse.modisco.kdm.uml2converter/src/org/eclipse/modisco/kdm/uml2converter/internal/Messages.java
@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 /**

  * @author gdupe

- * 

+ *

  */

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.kdm.uml2converter.internal.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.manifest.discoverer.ui/.checkstyle b/org.eclipse.modisco.manifest.discoverer.ui/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.manifest.discoverer.ui/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.manifest.discoverer/.checkstyle b/org.eclipse.modisco.manifest.discoverer/.checkstyle
index 2677dd503..cab29b435 100644
--- a/org.eclipse.modisco.manifest.discoverer/.checkstyle
+++ b/org.eclipse.modisco.manifest.discoverer/.checkstyle
@@ -10,7 +10,7 @@ Contributors:
     Grégoire Dupé (Mia-Software) - Bug 480183 - The manifest.mf discoverer should manage 'Export-Package'
 -->
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java
index 2fb565e81..67c6a304c 100644
--- a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java
+++ b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/Activator.java
@@ -35,7 +35,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -48,7 +48,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -61,7 +61,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer2.java b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer2.java
index 4b858f405..0ef4be0bc 100644
--- a/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer2.java
+++ b/org.eclipse.modisco.manifest.discoverer/src/org/eclipse/modisco/manifest/discoverer/ManifestModelDiscoverer2.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Frederic Madiot (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework

- *    Grégoire Dupé (Mia-Software) - Bug 480183 - The manifest.mf discoverer should manage 'Export-Package' 

+ *    Gr�goire Dup� (Mia-Software) - Bug 480183 - The manifest.mf discoverer should manage 'Export-Package'

  *******************************************************************************/

 package org.eclipse.modisco.manifest.discoverer;

 

@@ -88,10 +88,10 @@ public class ManifestModelDiscoverer2 extends AbstractModelDiscoverer<IFile> {
 			bundle.setActivationPolicy(manifestValues.get("Bundle-ActivationPolicy")); //$NON-NLS-1$

 			bundle.setRequiredExecutionEnvironment(manifestValues

 					.get("Bundle-RequiredExecutionEnvironment")); //$NON-NLS-1$

-			final ManifestElement[] rBundleMElts = 

+			final ManifestElement[] rBundleMElts =

 					parseHeader(manifestValues, "Require-Bundle"); //$NON-NLS-1$

 			if (rBundleMElts != null) {

-				final List<RequiredBundle> requiredBundles = 

+				final List<RequiredBundle> requiredBundles =

 						discoverRequiredBundle(rBundleMElts);

 				bundle.getRequiredBundles().addAll(requiredBundles);

 			}

@@ -118,7 +118,7 @@ public class ManifestModelDiscoverer2 extends AbstractModelDiscoverer<IFile> {
 	private static void discoverExportPackage(

 			final Map<String, String> manifestValues, final Bundle bundle)

 					throws BundleException {

-		final ManifestElement[] exportPackages = 

+		final ManifestElement[] exportPackages =

 				parseHeader(manifestValues, "Export-Package"); //$NON-NLS-1$

 		if (exportPackages != null) {

 			for (ManifestElement exportPackage : exportPackages) {

@@ -149,7 +149,7 @@ public class ManifestModelDiscoverer2 extends AbstractModelDiscoverer<IFile> {
 	private static void discoverImportPackage(

 			final Map<String, String> manifestValues, final Bundle bundle)

 					throws BundleException {

-		final ManifestElement[] importedPackages = 

+		final ManifestElement[] importedPackages =

 				parseHeader(manifestValues, "Import-Package"); //$NON-NLS-1$

 		if (importedPackages != null) {

 			for (ManifestElement element : importedPackages) {

diff --git a/org.eclipse.modisco.manifest/.checkstyle b/org.eclipse.modisco.manifest/.checkstyle
index 2f3e8f52d..094b6280b 100644
--- a/org.eclipse.modisco.manifest/.checkstyle
+++ b/org.eclipse.modisco.manifest/.checkstyle
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <fileset name="all" enabled="true" check-config-name="MoDisco" local="false">
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.manifest/.classpath b/org.eclipse.modisco.manifest/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.manifest/.classpath
+++ b/org.eclipse.modisco.manifest/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.manifest/build.properties b/org.eclipse.modisco.manifest/build.properties
index 908c88ff1..42a02432f 100644
--- a/org.eclipse.modisco.manifest/build.properties
+++ b/org.eclipse.modisco.manifest/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -7,6 +7,7 @@
 #

 # Contributors:

 #    Frederic Madiot (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 ###############################################################################

 

 bin.includes = .,\

@@ -16,6 +17,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.manifest/model/Manifest.genmodel b/org.eclipse.modisco.manifest/model/Manifest.genmodel
index c8d660e30..3595d6195 100644
--- a/org.eclipse.modisco.manifest/model/Manifest.genmodel
+++ b/org.eclipse.modisco.manifest/model/Manifest.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2010, 2015 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;    Frederic Madiot (Mia-Software) - metamodel design and initial implementation&#xD;&#xA;    Grégoire Dupé (Mia-Software) - Bug 480183 - The manifest.mf discoverer should manage 'Export-Package' "

-    modelDirectory="/org.eclipse.modisco.manifest/src" modelPluginID="org.eclipse.modisco.manifest"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;    Frederic Madiot (Mia-Software) - metamodel design and initial implementation&#xD;&#xA;    Grégoire Dupé (Mia-Software) - Bug 480183 - The manifest.mf discoverer should manage 'Export-Package' &#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.manifest/src-gen" modelPluginID="org.eclipse.modisco.manifest"

     modelName="Manifest" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" runtimeVersion="2.6">

   <foreignModel>Manifest.ecore</foreignModel>

diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/Bundle.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/Bundle.java
index 422d33c8f..422d33c8f 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/Bundle.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/Bundle.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ExportedPackage.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ExportedPackage.java
index c6e98ec31..c6e98ec31 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ExportedPackage.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ExportedPackage.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ImportedPackage.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ImportedPackage.java
index 1f478b005..1f478b005 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ImportedPackage.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ImportedPackage.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ManifestFactory.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ManifestFactory.java
index c6bea6c61..c6bea6c61 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ManifestFactory.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ManifestFactory.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ManifestPackage.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ManifestPackage.java
index e28b290a9..e28b290a9 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/ManifestPackage.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/ManifestPackage.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/RequiredBundle.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/RequiredBundle.java
index 56a4e5c72..56a4e5c72 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/RequiredBundle.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/RequiredBundle.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/Version.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/Version.java
index 48b94de0a..48b94de0a 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/Version.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/Version.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/BundleImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/BundleImpl.java
index 217b85631..217b85631 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/BundleImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/BundleImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ExportedPackageImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ExportedPackageImpl.java
index 9bd1bb54f..9bd1bb54f 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ExportedPackageImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ExportedPackageImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ImportedPackageImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ImportedPackageImpl.java
index 73a18392d..73a18392d 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ImportedPackageImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ImportedPackageImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ManifestFactoryImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ManifestFactoryImpl.java
index 3e8718664..3e8718664 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ManifestFactoryImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ManifestFactoryImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ManifestPackageImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ManifestPackageImpl.java
index e4e077ec0..e4e077ec0 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/ManifestPackageImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/ManifestPackageImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/RequiredBundleImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/RequiredBundleImpl.java
index a4e31ee0e..a4e31ee0e 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/RequiredBundleImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/RequiredBundleImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/VersionImpl.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/VersionImpl.java
index e9ebbd5d1..e9ebbd5d1 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/impl/VersionImpl.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/impl/VersionImpl.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/util/ManifestAdapterFactory.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/util/ManifestAdapterFactory.java
index 4e81b84db..4e81b84db 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/util/ManifestAdapterFactory.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/util/ManifestAdapterFactory.java
diff --git a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/util/ManifestSwitch.java b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/util/ManifestSwitch.java
index 6091f6988..6091f6988 100644
--- a/org.eclipse.modisco.manifest/src/org/eclipse/modisco/manifest/util/ManifestSwitch.java
+++ b/org.eclipse.modisco.manifest/src-gen/org/eclipse/modisco/manifest/util/ManifestSwitch.java
diff --git a/org.eclipse.modisco.omg.gastm/.checkstyle b/org.eclipse.modisco.omg.gastm/.checkstyle
index 33bf6b36c..ab2618135 100644
--- a/org.eclipse.modisco.omg.gastm/.checkstyle
+++ b/org.eclipse.modisco.omg.gastm/.checkstyle
@@ -6,6 +6,6 @@
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
   <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/modisco/omg/gastm"/>
+    <filter-data value="src-gen/"/>
   </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.omg.gastm/.classpath b/org.eclipse.modisco.omg.gastm/.classpath
index 45f024e85..cedf0d0d0 100644
--- a/org.eclipse.modisco.omg.gastm/.classpath
+++ b/org.eclipse.modisco.omg.gastm/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.omg.gastm/build.properties b/org.eclipse.modisco.omg.gastm/build.properties
index 1dad9cdf0..f1a07f31c 100644
--- a/org.eclipse.modisco.omg.gastm/build.properties
+++ b/org.eclipse.modisco.omg.gastm/build.properties
@@ -1,5 +1,5 @@
 # <copyright>

-# Copyright (c) 2009, 2010 Open Canarias, S.L.

+# Copyright (c) 2009, 2018 Open Canarias, S.L. and 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

@@ -7,6 +7,7 @@
 # 

 # Contributors:

 #     Adolfo Sanchez-Barbudo Herrera - Initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # 

 # </copyright>

 

@@ -17,6 +18,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.omg.gastm/model/gastm.genmodel b/org.eclipse.modisco.omg.gastm/model/gastm.genmodel
index 923f3d7f3..913bb54fe 100644
--- a/org.eclipse.modisco.omg.gastm/model/gastm.genmodel
+++ b/org.eclipse.modisco.omg.gastm/model/gastm.genmodel
@@ -1,8 +1,8 @@
 <?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="&lt;copyright>&#xD;&#xA;Copyright (c) 2009, 2010 Open Canarias, S.L.&#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;    Adolfo Sanchez-Barbudo Herrera - Initial API and implementation&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"

-    modelDirectory="/org.eclipse.modisco.omg.gastm/src" modelPluginID="org.eclipse.modisco.omg.gastm"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="&lt;copyright>&#xD;&#xA;Copyright (c) 2009, 2018 Open Canarias, S.L. and 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;    Adolfo Sanchez-Barbudo Herrera - Initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA;&#xD;&#xA;&lt;/copyright>"

+    modelDirectory="/org.eclipse.modisco.omg.gastm/src-gen" modelPluginID="org.eclipse.modisco.omg.gastm"

     modelName="GASTM" editPluginClass="org.eclipse.modisco.omg.gastm.provider.GASTMEditPlugin"

     nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false">

diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AccessKind.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AccessKind.java
index c091b84f0..c091b84f0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AccessKind.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AccessKind.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ActualParameter.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ActualParameter.java
index 32df2afbb..32df2afbb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ActualParameter.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ActualParameter.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ActualParameterExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ActualParameterExpression.java
index a7e25429b..a7e25429b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ActualParameterExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ActualParameterExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Add.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Add.java
index 72f4cf5ae..72f4cf5ae 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Add.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Add.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AddressOf.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AddressOf.java
index 7757253bd..7757253bd 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AddressOf.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AddressOf.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateExpression.java
index 79679b0e0..79679b0e0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateScope.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateScope.java
index 604b63bdf..604b63bdf 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateScope.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateScope.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateType.java
index 6a67e8b38..6a67e8b38 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateTypeDeclaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateTypeDeclaration.java
index 13968a8ed..13968a8ed 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateTypeDeclaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateTypeDeclaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateTypeDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateTypeDefinition.java
index c4d397d50..c4d397d50 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AggregateTypeDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AggregateTypeDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/And.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/And.java
index d1ea8f319..d1ea8f319 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/And.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/And.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AnnotationExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AnnotationExpression.java
index 470008294..470008294 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AnnotationExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AnnotationExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AnnotationType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AnnotationType.java
index f6d967fb7..f6d967fb7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/AnnotationType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/AnnotationType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ArrayAccess.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ArrayAccess.java
index f175429fe..f175429fe 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ArrayAccess.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ArrayAccess.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ArrayType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ArrayType.java
index 8c78e6cd0..8c78e6cd0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ArrayType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ArrayType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Assign.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Assign.java
index 60c29db2b..60c29db2b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Assign.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Assign.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BinaryExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BinaryExpression.java
index 54b672957..54b672957 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BinaryExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BinaryExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BinaryOperator.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BinaryOperator.java
index 7b796d5a0..7b796d5a0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BinaryOperator.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BinaryOperator.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitAnd.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitAnd.java
index 9a03e03a6..9a03e03a6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitAnd.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitAnd.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitFieldDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitFieldDefinition.java
index cf09f6c96..cf09f6c96 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitFieldDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitFieldDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitLeftShift.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitLeftShift.java
index 6dc9b19f3..6dc9b19f3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitLeftShift.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitLeftShift.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitLiteral.java
index 0ad489b38..0ad489b38 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitNot.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitNot.java
index 6e9dab763..6e9dab763 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitNot.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitNot.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitOr.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitOr.java
index e1c7eedc6..e1c7eedc6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitOr.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitOr.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitRightShift.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitRightShift.java
index 08d17f942..08d17f942 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitRightShift.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitRightShift.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitXor.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitXor.java
index 053ebe6e2..053ebe6e2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BitXor.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BitXor.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BlockScope.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BlockScope.java
index c4d6b8f2f..c4d6b8f2f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BlockScope.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BlockScope.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BlockStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BlockStatement.java
index 32bc2cf85..32bc2cf85 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BlockStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BlockStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Boolean.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Boolean.java
index cabaf2b1f..cabaf2b1f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Boolean.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Boolean.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BooleanLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BooleanLiteral.java
index 7129e8767..7129e8767 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BooleanLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BooleanLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BreakStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BreakStatement.java
index 6d0294618..6d0294618 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/BreakStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/BreakStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByReferenceActualParameterExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByReferenceActualParameterExpression.java
index bc5abce25..bc5abce25 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByReferenceActualParameterExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByReferenceActualParameterExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByReferenceFormalParameterType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByReferenceFormalParameterType.java
index af2fff57f..af2fff57f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByReferenceFormalParameterType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByReferenceFormalParameterType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByValueActualParameterExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByValueActualParameterExpression.java
index cbfefdb5b..cbfefdb5b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByValueActualParameterExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByValueActualParameterExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByValueFormalParameterType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByValueFormalParameterType.java
index dd2b0a636..dd2b0a636 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ByValueFormalParameterType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ByValueFormalParameterType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Byte.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Byte.java
index a815c1eb7..a815c1eb7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Byte.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Byte.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CaseBlock.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CaseBlock.java
index 94888ecdf..94888ecdf 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CaseBlock.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CaseBlock.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CastExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CastExpression.java
index 34e5c5228..34e5c5228 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CastExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CastExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CatchBlock.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CatchBlock.java
index 8ee0c9072..8ee0c9072 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CatchBlock.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CatchBlock.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CharLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CharLiteral.java
index 3f3adb8d8..3f3adb8d8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CharLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CharLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Character.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Character.java
index 859348e0b..859348e0b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Character.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Character.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ClassType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ClassType.java
index 864300869..864300869 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ClassType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ClassType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CollectionExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CollectionExpression.java
index 1469e4de8..1469e4de8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CollectionExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CollectionExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CollectionType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CollectionType.java
index bfed1faa9..bfed1faa9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CollectionType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CollectionType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Comment.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Comment.java
index e2122ed23..e2122ed23 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Comment.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Comment.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CompilationUnit.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CompilationUnit.java
index e6d5ca157..e6d5ca157 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/CompilationUnit.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/CompilationUnit.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ConditionalExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ConditionalExpression.java
index bd9787967..bd9787967 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ConditionalExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ConditionalExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ConstructedType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ConstructedType.java
index d83e6e554..d83e6e554 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ConstructedType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ConstructedType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ContinueStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ContinueStatement.java
index 15d7c7818..15d7c7818 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ContinueStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ContinueStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DataDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DataDefinition.java
index 175db8186..175db8186 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DataDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DataDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DataType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DataType.java
index a7920951c..a7920951c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DataType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DataType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Declaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Declaration.java
index 9b70009f3..9b70009f3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Declaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Declaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DeclarationOrDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DeclarationOrDefinition.java
index e66023390..e66023390 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DeclarationOrDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DeclarationOrDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DeclarationOrDefinitionStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DeclarationOrDefinitionStatement.java
index 594496eee..594496eee 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DeclarationOrDefinitionStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DeclarationOrDefinitionStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Decrement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Decrement.java
index 1b66e5454..1b66e5454 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Decrement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Decrement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DefaultBlock.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DefaultBlock.java
index dcc945c33..dcc945c33 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DefaultBlock.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DefaultBlock.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Definition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Definition.java
index 351981fa6..351981fa6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Definition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Definition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DefinitionObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DefinitionObject.java
index 9517c1e76..9517c1e76 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DefinitionObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DefinitionObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DeleteStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DeleteStatement.java
index 858ef3e0e..858ef3e0e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DeleteStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DeleteStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Deref.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Deref.java
index b2bff3f8a..b2bff3f8a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Deref.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Deref.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DerivesFrom.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DerivesFrom.java
index b3e4fab34..b3e4fab34 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DerivesFrom.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DerivesFrom.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Dimension.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Dimension.java
index 3d5004858..3d5004858 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Dimension.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Dimension.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Divide.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Divide.java
index 1badbdbcc..1badbdbcc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Divide.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Divide.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DoWhileStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DoWhileStatement.java
index cbfd7fad4..cbfd7fad4 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/DoWhileStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/DoWhileStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Double.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Double.java
index 78c1dc3cc..78c1dc3cc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Double.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Double.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EmptyStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EmptyStatement.java
index 97160a871..97160a871 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EmptyStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EmptyStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EntryDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EntryDefinition.java
index aceea5a84..aceea5a84 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EntryDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EntryDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumLiteral.java
index a594880d9..a594880d9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumLiteralDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumLiteralDefinition.java
index 263f2c768..263f2c768 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumLiteralDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumLiteralDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumType.java
index 752925166..752925166 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumTypeDeclaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumTypeDeclaration.java
index 4c2c5ba46..4c2c5ba46 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumTypeDeclaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumTypeDeclaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumTypeDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumTypeDefinition.java
index 9332ef0ca..9332ef0ca 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/EnumTypeDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/EnumTypeDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Equal.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Equal.java
index 27bc29131..27bc29131 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Equal.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Equal.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ExceptionType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ExceptionType.java
index 093e71fa5..093e71fa5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ExceptionType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ExceptionType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Exponent.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Exponent.java
index 94428278d..94428278d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Exponent.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Exponent.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Expression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Expression.java
index a1b53bbb6..a1b53bbb6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Expression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Expression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ExpressionStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ExpressionStatement.java
index 728bf421d..728bf421d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ExpressionStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ExpressionStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/External.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/External.java
index cbe827ab5..cbe827ab5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/External.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/External.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FileLocal.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FileLocal.java
index 383921080..383921080 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FileLocal.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FileLocal.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ForCheckAfterStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ForCheckAfterStatement.java
index 7ff826b31..7ff826b31 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ForCheckAfterStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ForCheckAfterStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ForCheckBeforeStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ForCheckBeforeStatement.java
index 6a8cd021a..6a8cd021a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ForCheckBeforeStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ForCheckBeforeStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ForStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ForStatement.java
index 08e6a02b1..08e6a02b1 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ForStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ForStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FormalParameterDeclaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FormalParameterDeclaration.java
index 980732c99..980732c99 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FormalParameterDeclaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FormalParameterDeclaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FormalParameterDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FormalParameterDefinition.java
index 8a7972710..8a7972710 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FormalParameterDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FormalParameterDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FormalParameterType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FormalParameterType.java
index 80c6ef0c2..80c6ef0c2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FormalParameterType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FormalParameterType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionCallExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionCallExpression.java
index d578cfe4a..d578cfe4a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionCallExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionCallExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionDeclaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionDeclaration.java
index 73b41fcc8..73b41fcc8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionDeclaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionDeclaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionDefinition.java
index 2a7d2e0a8..2a7d2e0a8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionMemberAttributes.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionMemberAttributes.java
index 8be33746f..8be33746f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionMemberAttributes.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionMemberAttributes.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionPersistent.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionPersistent.java
index 2f7fae0f5..2f7fae0f5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionPersistent.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionPersistent.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionScope.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionScope.java
index 481dc7775..481dc7775 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionScope.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionScope.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionType.java
index 6e5ad2e94..6e5ad2e94 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/FunctionType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/FunctionType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMFactory.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMFactory.java
index 8bfa30959..8bfa30959 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMFactory.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMFactory.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMObject.java
index 4151278b1..4151278b1 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMPackage.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMPackage.java
index 6ca6f3948..6ca6f3948 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMPackage.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMPackage.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMSemanticObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMSemanticObject.java
index b44ae2271..b44ae2271 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMSemanticObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMSemanticObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMSourceObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMSourceObject.java
index 01378d443..01378d443 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMSourceObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMSourceObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMSyntaxObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMSyntaxObject.java
index 1d024526f..1d024526f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GASTMSyntaxObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GASTMSyntaxObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GlobalScope.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GlobalScope.java
index 350d9393a..350d9393a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/GlobalScope.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/GlobalScope.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Greater.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Greater.java
index 259ac792b..259ac792b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Greater.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Greater.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IdentifierReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IdentifierReference.java
index 3e78d4cb8..3e78d4cb8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IdentifierReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IdentifierReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IfStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IfStatement.java
index 2d975d48b..2d975d48b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IfStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IfStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IncludeUnit.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IncludeUnit.java
index 10b28bc19..10b28bc19 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IncludeUnit.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IncludeUnit.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Increment.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Increment.java
index 5eca04121..5eca04121 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Increment.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Increment.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Integer.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Integer.java
index b9aebc2ea..b9aebc2ea 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Integer.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Integer.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IntegerLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IntegerLiteral.java
index aa236eaa5..aa236eaa5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IntegerLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IntegerLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IntegralType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IntegralType.java
index d0f4f7995..d0f4f7995 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/IntegralType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/IntegralType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/JumpStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/JumpStatement.java
index d2b16e44c..d2b16e44c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/JumpStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/JumpStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabelAccess.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabelAccess.java
index 3614b2a3e..3614b2a3e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabelAccess.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabelAccess.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabelDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabelDefinition.java
index a82039bb4..a82039bb4 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabelDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabelDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabelType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabelType.java
index 264bedbb2..264bedbb2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabelType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabelType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabeledStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabeledStatement.java
index 4fae0b1eb..4fae0b1eb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LabeledStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LabeledStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Less.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Less.java
index 5c435d49a..5c435d49a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Less.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Less.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Literal.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Literal.java
index ba0bc8c30..ba0bc8c30 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Literal.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Literal.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LongDouble.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LongDouble.java
index ce12b712e..ce12b712e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LongDouble.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LongDouble.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LongInteger.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LongInteger.java
index 27a341e19..27a341e19 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LongInteger.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LongInteger.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LoopStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LoopStatement.java
index 6bbfe8b89..6bbfe8b89 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/LoopStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/LoopStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MacroCall.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MacroCall.java
index fa61d3a32..fa61d3a32 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MacroCall.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MacroCall.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MacroDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MacroDefinition.java
index c45d0e138..c45d0e138 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MacroDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MacroDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MemberObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MemberObject.java
index 9e6d7a28e..9e6d7a28e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MemberObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MemberObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MinorSyntaxObject.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MinorSyntaxObject.java
index 7f1f478e9..7f1f478e9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MinorSyntaxObject.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MinorSyntaxObject.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MissingActualParameter.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MissingActualParameter.java
index 76b414c65..76b414c65 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/MissingActualParameter.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/MissingActualParameter.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Modulus.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Modulus.java
index 66b0d9bfa..66b0d9bfa 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Modulus.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Modulus.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Multiply.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Multiply.java
index bc79d5124..bc79d5124 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Multiply.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Multiply.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Name.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Name.java
index dc410b76f..dc410b76f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Name.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Name.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NameReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NameReference.java
index b0b08ba15..b0b08ba15 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NameReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NameReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NameSpaceDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NameSpaceDefinition.java
index bde68cf3a..bde68cf3a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NameSpaceDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NameSpaceDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NameSpaceType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NameSpaceType.java
index 705f1dcd0..705f1dcd0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NameSpaceType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NameSpaceType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NamedType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NamedType.java
index 7ef47fa48..7ef47fa48 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NamedType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NamedType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NamedTypeDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NamedTypeDefinition.java
index af4cb8098..af4cb8098 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NamedTypeDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NamedTypeDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NamedTypeReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NamedTypeReference.java
index bff797bdc..bff797bdc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NamedTypeReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NamedTypeReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NewExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NewExpression.java
index 206ced057..206ced057 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NewExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NewExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NoDef.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NoDef.java
index bf1232fcb..bf1232fcb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NoDef.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NoDef.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Not.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Not.java
index 6ff7ea66f..6ff7ea66f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Not.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Not.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NotEqual.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NotEqual.java
index f40da622d..f40da622d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NotEqual.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NotEqual.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NotGreater.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NotGreater.java
index ef821d0de..ef821d0de 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NotGreater.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NotGreater.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NotLess.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NotLess.java
index 1109139d7..1109139d7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NotLess.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NotLess.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NumberType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NumberType.java
index cccdd38fb..cccdd38fb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/NumberType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/NumberType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/OperatorAssign.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/OperatorAssign.java
index f2ea73073..f2ea73073 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/OperatorAssign.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/OperatorAssign.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Or.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Or.java
index 191c0bf31..191c0bf31 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Or.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Or.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PerClassMember.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PerClassMember.java
index 897f6611b..897f6611b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PerClassMember.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PerClassMember.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PointerType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PointerType.java
index 8910e407c..8910e407c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PointerType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PointerType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PostDecrement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PostDecrement.java
index a15bca50d..a15bca50d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PostDecrement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PostDecrement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PostIncrement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PostIncrement.java
index caad3ef0a..caad3ef0a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PostIncrement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PostIncrement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PreprocessorElement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PreprocessorElement.java
index b756a2c45..b756a2c45 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PreprocessorElement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PreprocessorElement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PrimitiveType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PrimitiveType.java
index 21f674c7d..21f674c7d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/PrimitiveType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/PrimitiveType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Private.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Private.java
index d0ed44051..d0ed44051 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Private.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Private.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ProgramScope.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ProgramScope.java
index c876c01a6..c876c01a6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ProgramScope.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ProgramScope.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Project.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Project.java
index fc50fd049..fc50fd049 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Project.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Project.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Protected.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Protected.java
index d89cea542..d89cea542 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Protected.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Protected.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Public.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Public.java
index 0e7ae8c87..0e7ae8c87 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Public.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Public.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/QualifiedIdentifierReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/QualifiedIdentifierReference.java
index ab6d2c8ee..ab6d2c8ee 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/QualifiedIdentifierReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/QualifiedIdentifierReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/QualifiedOverData.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/QualifiedOverData.java
index bb70e09d3..bb70e09d3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/QualifiedOverData.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/QualifiedOverData.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/QualifiedOverPointer.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/QualifiedOverPointer.java
index 6e79a30f2..6e79a30f2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/QualifiedOverPointer.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/QualifiedOverPointer.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RangeExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RangeExpression.java
index 469588718..469588718 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RangeExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RangeExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RangeType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RangeType.java
index 8e25ecf0f..8e25ecf0f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RangeType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RangeType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Real.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Real.java
index f1d9fd20c..f1d9fd20c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Real.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Real.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RealLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RealLiteral.java
index 192729fb2..192729fb2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RealLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RealLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RealType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RealType.java
index 9f380a320..9f380a320 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/RealType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/RealType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ReferenceType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ReferenceType.java
index bf82ae9de..bf82ae9de 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ReferenceType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ReferenceType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ReturnStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ReturnStatement.java
index 69f07dc01..69f07dc01 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ReturnStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ReturnStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Scope.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Scope.java
index eeafcf228..eeafcf228 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Scope.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Scope.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ShortInteger.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ShortInteger.java
index b77f39b01..b77f39b01 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ShortInteger.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ShortInteger.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SourceFile.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SourceFile.java
index 3f8fdc352..3f8fdc352 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SourceFile.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SourceFile.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SourceFileReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SourceFileReference.java
index d68d851f2..d68d851f2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SourceFileReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SourceFileReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SourceLocation.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SourceLocation.java
index b674e8956..b674e8956 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SourceLocation.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SourceLocation.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Statement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Statement.java
index 376ad7cda..376ad7cda 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Statement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Statement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/StorageSpecification.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/StorageSpecification.java
index fd9fec5c3..fd9fec5c3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/StorageSpecification.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/StorageSpecification.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/StringLiteral.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/StringLiteral.java
index 623e661c0..623e661c0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/StringLiteral.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/StringLiteral.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/StructureType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/StructureType.java
index f825719b2..f825719b2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/StructureType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/StructureType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Subtract.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Subtract.java
index 75170392b..75170392b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Subtract.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Subtract.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SwitchCase.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SwitchCase.java
index 5417643e9..5417643e9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SwitchCase.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SwitchCase.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SwitchStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SwitchStatement.java
index fc5413601..fc5413601 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/SwitchStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/SwitchStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TerminateStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TerminateStatement.java
index 366357c83..366357c83 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TerminateStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TerminateStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ThrowStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ThrowStatement.java
index b33ec684d..b33ec684d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/ThrowStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/ThrowStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TryStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TryStatement.java
index 834f5bf51..834f5bf51 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TryStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TryStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Type.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Type.java
index d15feb65f..d15feb65f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Type.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Type.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeDeclaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeDeclaration.java
index 3acdcdc8c..3acdcdc8c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeDeclaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeDeclaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeDefinition.java
index de0c0050f..de0c0050f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeQualifiedIdentifierReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeQualifiedIdentifierReference.java
index cda4d9b95..cda4d9b95 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeQualifiedIdentifierReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeQualifiedIdentifierReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeReference.java
index a3fa7ebae..a3fa7ebae 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypeReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypeReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypesCatchBlock.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypesCatchBlock.java
index 5b36afd19..5b36afd19 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/TypesCatchBlock.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/TypesCatchBlock.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryExpression.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryExpression.java
index f7c88be3e..f7c88be3e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryExpression.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryExpression.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryMinus.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryMinus.java
index 8da19cbe6..8da19cbe6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryMinus.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryMinus.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryOperator.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryOperator.java
index ac04262c9..ac04262c9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryOperator.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryOperator.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryPlus.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryPlus.java
index 4778dadb6..4778dadb6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnaryPlus.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnaryPlus.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnionType.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnionType.java
index 2e93a286c..2e93a286c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnionType.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnionType.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnnamedTypeReference.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnnamedTypeReference.java
index 29095b6e8..29095b6e8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/UnnamedTypeReference.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/UnnamedTypeReference.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VariableCatchBlock.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VariableCatchBlock.java
index c7ac7bd9c..c7ac7bd9c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VariableCatchBlock.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VariableCatchBlock.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VariableDeclaration.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VariableDeclaration.java
index 49a62d69b..49a62d69b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VariableDeclaration.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VariableDeclaration.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VariableDefinition.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VariableDefinition.java
index 9979180f4..9979180f4 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VariableDefinition.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VariableDefinition.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Virtual.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Virtual.java
index a17a3f6f5..a17a3f6f5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Virtual.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Virtual.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VirtualSpecification.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VirtualSpecification.java
index afd792496..afd792496 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/VirtualSpecification.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/VirtualSpecification.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Void.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Void.java
index 3e67e196f..3e67e196f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/Void.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/Void.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/WhileStatement.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/WhileStatement.java
index 598c26283..598c26283 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/WhileStatement.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/WhileStatement.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AccessKindImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AccessKindImpl.java
index 9fd59aa79..9fd59aa79 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AccessKindImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AccessKindImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ActualParameterExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ActualParameterExpressionImpl.java
index 2822d2138..2822d2138 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ActualParameterExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ActualParameterExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ActualParameterImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ActualParameterImpl.java
index bb8d10651..bb8d10651 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ActualParameterImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ActualParameterImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AddImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AddImpl.java
index e001d1798..e001d1798 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AddImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AddImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AddressOfImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AddressOfImpl.java
index 83dc2fc33..83dc2fc33 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AddressOfImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AddressOfImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateExpressionImpl.java
index 683e62ce4..683e62ce4 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateScopeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateScopeImpl.java
index da952be74..da952be74 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateScopeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateScopeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDeclarationImpl.java
index f12d5d741..f12d5d741 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDefinitionImpl.java
index 910ae1940..910ae1940 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateTypeDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateTypeImpl.java
index 837e9ed4e..837e9ed4e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AggregateTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AggregateTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AndImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AndImpl.java
index bd9c7ae4c..bd9c7ae4c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AndImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AndImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AnnotationExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AnnotationExpressionImpl.java
index 65a395eff..65a395eff 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AnnotationExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AnnotationExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AnnotationTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AnnotationTypeImpl.java
index e06d31843..e06d31843 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AnnotationTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AnnotationTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ArrayAccessImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ArrayAccessImpl.java
index bc1521b11..bc1521b11 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ArrayAccessImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ArrayAccessImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ArrayTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ArrayTypeImpl.java
index 4315f6532..4315f6532 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ArrayTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ArrayTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AssignImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AssignImpl.java
index 1d916bd5f..1d916bd5f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/AssignImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/AssignImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BinaryExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BinaryExpressionImpl.java
index 3f9d00f4a..3f9d00f4a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BinaryExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BinaryExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BinaryOperatorImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BinaryOperatorImpl.java
index e70a4b412..e70a4b412 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BinaryOperatorImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BinaryOperatorImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitAndImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitAndImpl.java
index 2787ab259..2787ab259 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitAndImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitAndImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitFieldDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitFieldDefinitionImpl.java
index 8d8640ce1..8d8640ce1 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitFieldDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitFieldDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitLeftShiftImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitLeftShiftImpl.java
index 1b083bb00..1b083bb00 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitLeftShiftImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitLeftShiftImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitLiteralImpl.java
index f9a36e234..f9a36e234 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitNotImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitNotImpl.java
index 1d09386e4..1d09386e4 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitNotImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitNotImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitOrImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitOrImpl.java
index bf674216a..bf674216a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitOrImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitOrImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitRightShiftImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitRightShiftImpl.java
index 9c2b0942a..9c2b0942a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitRightShiftImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitRightShiftImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitXorImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitXorImpl.java
index ed99e8038..ed99e8038 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BitXorImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BitXorImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BlockScopeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BlockScopeImpl.java
index 77ee2b006..77ee2b006 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BlockScopeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BlockScopeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BlockStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BlockStatementImpl.java
index 1194c747b..1194c747b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BlockStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BlockStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BooleanImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BooleanImpl.java
index 5c466378d..5c466378d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BooleanImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BooleanImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BooleanLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BooleanLiteralImpl.java
index 01530b545..01530b545 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BooleanLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BooleanLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BreakStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BreakStatementImpl.java
index 65062b622..65062b622 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/BreakStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/BreakStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByReferenceActualParameterExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByReferenceActualParameterExpressionImpl.java
index 194243ae0..194243ae0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByReferenceActualParameterExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByReferenceActualParameterExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByReferenceFormalParameterTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByReferenceFormalParameterTypeImpl.java
index 07e009ae9..07e009ae9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByReferenceFormalParameterTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByReferenceFormalParameterTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByValueActualParameterExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByValueActualParameterExpressionImpl.java
index aeadcd8aa..aeadcd8aa 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByValueActualParameterExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByValueActualParameterExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByValueFormalParameterTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByValueFormalParameterTypeImpl.java
index 1c50449ff..1c50449ff 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByValueFormalParameterTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByValueFormalParameterTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByteImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByteImpl.java
index 4005e91a0..4005e91a0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ByteImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ByteImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CaseBlockImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CaseBlockImpl.java
index 5d5ab3918..5d5ab3918 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CaseBlockImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CaseBlockImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CastExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CastExpressionImpl.java
index 5957414cb..5957414cb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CastExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CastExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CatchBlockImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CatchBlockImpl.java
index 20953f3fa..20953f3fa 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CatchBlockImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CatchBlockImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CharLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CharLiteralImpl.java
index 3f02577ed..3f02577ed 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CharLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CharLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CharacterImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CharacterImpl.java
index 406cc6a6b..406cc6a6b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CharacterImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CharacterImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ClassTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ClassTypeImpl.java
index d284c7730..d284c7730 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ClassTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ClassTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CollectionExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CollectionExpressionImpl.java
index 482f22c5e..482f22c5e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CollectionExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CollectionExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CollectionTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CollectionTypeImpl.java
index 3bf89bb0e..3bf89bb0e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CollectionTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CollectionTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CommentImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CommentImpl.java
index 5c49e069f..5c49e069f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CommentImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CommentImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CompilationUnitImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CompilationUnitImpl.java
index f37dad962..f37dad962 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/CompilationUnitImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/CompilationUnitImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ConditionalExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ConditionalExpressionImpl.java
index e35a385c7..e35a385c7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ConditionalExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ConditionalExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ConstructedTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ConstructedTypeImpl.java
index 7886ca8bd..7886ca8bd 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ConstructedTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ConstructedTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ContinueStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ContinueStatementImpl.java
index f0a32ba46..f0a32ba46 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ContinueStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ContinueStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DataDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DataDefinitionImpl.java
index 8ea2b20bc..8ea2b20bc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DataDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DataDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DataTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DataTypeImpl.java
index 5df47b6f0..5df47b6f0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DataTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DataTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeclarationImpl.java
index 2aed0b6e7..2aed0b6e7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionImpl.java
index 6a463eafa..6a463eafa 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionStatementImpl.java
index 8198a3b71..8198a3b71 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeclarationOrDefinitionStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DecrementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DecrementImpl.java
index 58729a819..58729a819 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DecrementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DecrementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DefaultBlockImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DefaultBlockImpl.java
index e0fd4b1df..e0fd4b1df 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DefaultBlockImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DefaultBlockImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DefinitionImpl.java
index b1cc4d44d..b1cc4d44d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DefinitionObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DefinitionObjectImpl.java
index 07415f984..07415f984 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DefinitionObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DefinitionObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeleteStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeleteStatementImpl.java
index be3d1bf30..be3d1bf30 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DeleteStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DeleteStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DerefImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DerefImpl.java
index 0e167b08d..0e167b08d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DerefImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DerefImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DerivesFromImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DerivesFromImpl.java
index 669ddf32d..669ddf32d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DerivesFromImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DerivesFromImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DimensionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DimensionImpl.java
index 207f220a0..207f220a0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DimensionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DimensionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DivideImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DivideImpl.java
index 33fa6b57d..33fa6b57d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DivideImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DivideImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DoWhileStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DoWhileStatementImpl.java
index 76c3414e5..76c3414e5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DoWhileStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DoWhileStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DoubleImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DoubleImpl.java
index da036f5c9..da036f5c9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/DoubleImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/DoubleImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EmptyStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EmptyStatementImpl.java
index aa2b21c86..aa2b21c86 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EmptyStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EmptyStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EntryDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EntryDefinitionImpl.java
index 7dc8573e2..7dc8573e2 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EntryDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EntryDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumLiteralDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumLiteralDefinitionImpl.java
index 2c9958c19..2c9958c19 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumLiteralDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumLiteralDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumLiteralImpl.java
index b655d7507..b655d7507 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumTypeDeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumTypeDeclarationImpl.java
index e67fc5997..e67fc5997 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumTypeDeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumTypeDeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumTypeDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumTypeDefinitionImpl.java
index 78aa104ab..78aa104ab 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumTypeDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumTypeDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumTypeImpl.java
index d67027157..d67027157 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EnumTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EnumTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EqualImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EqualImpl.java
index 6bfbdf4ec..6bfbdf4ec 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/EqualImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/EqualImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExceptionTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExceptionTypeImpl.java
index 6c59498cb..6c59498cb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExceptionTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExceptionTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExponentImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExponentImpl.java
index d5fc731e8..d5fc731e8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExponentImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExponentImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExpressionImpl.java
index 495e08948..495e08948 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExpressionStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExpressionStatementImpl.java
index 53fd8b07d..53fd8b07d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExpressionStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExpressionStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExternalImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExternalImpl.java
index 67f8454df..67f8454df 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ExternalImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ExternalImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FileLocalImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FileLocalImpl.java
index 205e7d364..205e7d364 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FileLocalImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FileLocalImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ForCheckAfterStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ForCheckAfterStatementImpl.java
index 25e9b3aa1..25e9b3aa1 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ForCheckAfterStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ForCheckAfterStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ForCheckBeforeStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ForCheckBeforeStatementImpl.java
index 744165c45..744165c45 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ForCheckBeforeStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ForCheckBeforeStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ForStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ForStatementImpl.java
index 8b4d4094f..8b4d4094f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ForStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ForStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FormalParameterDeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FormalParameterDeclarationImpl.java
index da568fecb..da568fecb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FormalParameterDeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FormalParameterDeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FormalParameterDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FormalParameterDefinitionImpl.java
index e3673ed06..e3673ed06 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FormalParameterDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FormalParameterDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FormalParameterTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FormalParameterTypeImpl.java
index d4672d8a3..d4672d8a3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FormalParameterTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FormalParameterTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionCallExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionCallExpressionImpl.java
index 419faeccf..419faeccf 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionCallExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionCallExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionDeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionDeclarationImpl.java
index b5bc29f65..b5bc29f65 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionDeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionDeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionDefinitionImpl.java
index c7349818f..c7349818f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionMemberAttributesImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionMemberAttributesImpl.java
index c88c387c7..c88c387c7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionMemberAttributesImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionMemberAttributesImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionPersistentImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionPersistentImpl.java
index be65fc84f..be65fc84f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionPersistentImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionPersistentImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionScopeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionScopeImpl.java
index 2962b4550..2962b4550 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionScopeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionScopeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionTypeImpl.java
index 9ab9378ba..9ab9378ba 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/FunctionTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/FunctionTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMFactoryImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMFactoryImpl.java
index ceefca57f..ceefca57f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMFactoryImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMFactoryImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMObjectImpl.java
index abcd06716..abcd06716 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMPackageImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMPackageImpl.java
index d4a59239b..d4a59239b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMPackageImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMPackageImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMSemanticObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMSemanticObjectImpl.java
index c5007971e..c5007971e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMSemanticObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMSemanticObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMSourceObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMSourceObjectImpl.java
index 361894296..361894296 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMSourceObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMSourceObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMSyntaxObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMSyntaxObjectImpl.java
index 780884f53..780884f53 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GASTMSyntaxObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GASTMSyntaxObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GlobalScopeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GlobalScopeImpl.java
index 785a9b785..785a9b785 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GlobalScopeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GlobalScopeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GreaterImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GreaterImpl.java
index 398663c3b..398663c3b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/GreaterImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/GreaterImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IdentifierReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IdentifierReferenceImpl.java
index 9d40666b5..9d40666b5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IdentifierReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IdentifierReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IfStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IfStatementImpl.java
index dfe6a4ef3..dfe6a4ef3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IfStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IfStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IncludeUnitImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IncludeUnitImpl.java
index 43088e602..43088e602 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IncludeUnitImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IncludeUnitImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IncrementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IncrementImpl.java
index ee78b2130..ee78b2130 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IncrementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IncrementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IntegerImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IntegerImpl.java
index 6cdb92804..6cdb92804 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IntegerImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IntegerImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IntegerLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IntegerLiteralImpl.java
index 6fffd2497..6fffd2497 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IntegerLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IntegerLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IntegralTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IntegralTypeImpl.java
index a7a5f994b..a7a5f994b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/IntegralTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/IntegralTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/JumpStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/JumpStatementImpl.java
index b50c706cc..b50c706cc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/JumpStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/JumpStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabelAccessImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabelAccessImpl.java
index 3d69a8c1f..3d69a8c1f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabelAccessImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabelAccessImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabelDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabelDefinitionImpl.java
index dfe48d5ec..dfe48d5ec 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabelDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabelDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabelTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabelTypeImpl.java
index 4c9bd5052..4c9bd5052 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabelTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabelTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabeledStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabeledStatementImpl.java
index 6c6e47409..6c6e47409 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LabeledStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LabeledStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LessImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LessImpl.java
index 227893e18..227893e18 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LessImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LessImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LiteralImpl.java
index 56de224e8..56de224e8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LongDoubleImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LongDoubleImpl.java
index 59d3839f8..59d3839f8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LongDoubleImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LongDoubleImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LongIntegerImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LongIntegerImpl.java
index 64f04ab2d..64f04ab2d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LongIntegerImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LongIntegerImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LoopStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LoopStatementImpl.java
index f2d2484dc..f2d2484dc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/LoopStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/LoopStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MacroCallImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MacroCallImpl.java
index 450001f9a..450001f9a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MacroCallImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MacroCallImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MacroDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MacroDefinitionImpl.java
index 3a7eda54e..3a7eda54e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MacroDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MacroDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MemberObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MemberObjectImpl.java
index 6e1a0b80d..6e1a0b80d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MemberObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MemberObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MinorSyntaxObjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MinorSyntaxObjectImpl.java
index 7220dce75..7220dce75 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MinorSyntaxObjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MinorSyntaxObjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MissingActualParameterImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MissingActualParameterImpl.java
index 820cdabf0..820cdabf0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MissingActualParameterImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MissingActualParameterImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ModulusImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ModulusImpl.java
index 38543948f..38543948f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ModulusImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ModulusImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MultiplyImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MultiplyImpl.java
index bf7116f01..bf7116f01 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/MultiplyImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/MultiplyImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameImpl.java
index 0c9338cf1..0c9338cf1 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameReferenceImpl.java
index 81824dd4c..81824dd4c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameSpaceDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameSpaceDefinitionImpl.java
index a7cbec6f7..a7cbec6f7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameSpaceDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameSpaceDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameSpaceTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameSpaceTypeImpl.java
index 301c41fc5..301c41fc5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NameSpaceTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NameSpaceTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NamedTypeDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NamedTypeDefinitionImpl.java
index a781f5c39..a781f5c39 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NamedTypeDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NamedTypeDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NamedTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NamedTypeImpl.java
index a7fc7caa3..a7fc7caa3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NamedTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NamedTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NamedTypeReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NamedTypeReferenceImpl.java
index 1f60d2f59..1f60d2f59 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NamedTypeReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NamedTypeReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NewExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NewExpressionImpl.java
index ea93ddfcb..ea93ddfcb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NewExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NewExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NoDefImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NoDefImpl.java
index d74b0fee6..d74b0fee6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NoDefImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NoDefImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotEqualImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotEqualImpl.java
index e6ec99222..e6ec99222 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotEqualImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotEqualImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotGreaterImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotGreaterImpl.java
index c149b6c6c..c149b6c6c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotGreaterImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotGreaterImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotImpl.java
index eb88680f5..eb88680f5 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotLessImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotLessImpl.java
index 836ec01ea..836ec01ea 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NotLessImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NotLessImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NumberTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NumberTypeImpl.java
index f4ee23290..f4ee23290 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/NumberTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/NumberTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/OperatorAssignImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/OperatorAssignImpl.java
index 2875fb9bf..2875fb9bf 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/OperatorAssignImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/OperatorAssignImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/OrImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/OrImpl.java
index 9540e5396..9540e5396 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/OrImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/OrImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PerClassMemberImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PerClassMemberImpl.java
index 4c29ae70a..4c29ae70a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PerClassMemberImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PerClassMemberImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PointerTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PointerTypeImpl.java
index 230f8267f..230f8267f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PointerTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PointerTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PostDecrementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PostDecrementImpl.java
index ea0e44cf9..ea0e44cf9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PostDecrementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PostDecrementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PostIncrementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PostIncrementImpl.java
index 09e901596..09e901596 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PostIncrementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PostIncrementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PreprocessorElementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PreprocessorElementImpl.java
index b1fb7a5be..b1fb7a5be 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PreprocessorElementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PreprocessorElementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PrimitiveTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PrimitiveTypeImpl.java
index 77263c4d0..77263c4d0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PrimitiveTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PrimitiveTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PrivateImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PrivateImpl.java
index 57c59b46b..57c59b46b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PrivateImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PrivateImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ProgramScopeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ProgramScopeImpl.java
index 79d239e8a..79d239e8a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ProgramScopeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ProgramScopeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ProjectImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ProjectImpl.java
index 26e80fc33..26e80fc33 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ProjectImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ProjectImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ProtectedImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ProtectedImpl.java
index 863ab7d09..863ab7d09 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ProtectedImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ProtectedImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PublicImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PublicImpl.java
index 75b5adc87..75b5adc87 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/PublicImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/PublicImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/QualifiedIdentifierReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/QualifiedIdentifierReferenceImpl.java
index bd28d3c9a..bd28d3c9a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/QualifiedIdentifierReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/QualifiedIdentifierReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/QualifiedOverDataImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/QualifiedOverDataImpl.java
index ea7a7384d..ea7a7384d 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/QualifiedOverDataImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/QualifiedOverDataImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/QualifiedOverPointerImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/QualifiedOverPointerImpl.java
index 96260301e..96260301e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/QualifiedOverPointerImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/QualifiedOverPointerImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RangeExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RangeExpressionImpl.java
index 17d8bc820..17d8bc820 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RangeExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RangeExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RangeTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RangeTypeImpl.java
index e821846c9..e821846c9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RangeTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RangeTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RealImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RealImpl.java
index 7c9556a20..7c9556a20 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RealImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RealImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RealLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RealLiteralImpl.java
index dc69ac9ca..dc69ac9ca 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RealLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RealLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RealTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RealTypeImpl.java
index 2d9a697ce..2d9a697ce 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/RealTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/RealTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ReferenceTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ReferenceTypeImpl.java
index 7aedbaa3c..7aedbaa3c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ReferenceTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ReferenceTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ReturnStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ReturnStatementImpl.java
index a732e9592..a732e9592 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ReturnStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ReturnStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ScopeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ScopeImpl.java
index 889ad0b72..889ad0b72 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ScopeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ScopeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ShortIntegerImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ShortIntegerImpl.java
index 8848d3c83..8848d3c83 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ShortIntegerImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ShortIntegerImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SourceFileImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SourceFileImpl.java
index 21cf6b841..21cf6b841 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SourceFileImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SourceFileImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SourceFileReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SourceFileReferenceImpl.java
index 7d5be92e6..7d5be92e6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SourceFileReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SourceFileReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SourceLocationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SourceLocationImpl.java
index a82291486..a82291486 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SourceLocationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SourceLocationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StatementImpl.java
index 0aa91c37f..0aa91c37f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StorageSpecificationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StorageSpecificationImpl.java
index e2d8fc581..e2d8fc581 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StorageSpecificationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StorageSpecificationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StringLiteralImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StringLiteralImpl.java
index 9450fe872..9450fe872 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StringLiteralImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StringLiteralImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StructureTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StructureTypeImpl.java
index 18065aaac..18065aaac 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/StructureTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/StructureTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SubtractImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SubtractImpl.java
index e89cfbc5a..e89cfbc5a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SubtractImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SubtractImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SwitchCaseImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SwitchCaseImpl.java
index 43cef5ae8..43cef5ae8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SwitchCaseImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SwitchCaseImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SwitchStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SwitchStatementImpl.java
index 4e08efc73..4e08efc73 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/SwitchStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/SwitchStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TerminateStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TerminateStatementImpl.java
index 9229463b8..9229463b8 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TerminateStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TerminateStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ThrowStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ThrowStatementImpl.java
index cf87e1cd6..cf87e1cd6 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/ThrowStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/ThrowStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TryStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TryStatementImpl.java
index a067eacdb..a067eacdb 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TryStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TryStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeDeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeDeclarationImpl.java
index 2ad52f042..2ad52f042 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeDeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeDeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeDefinitionImpl.java
index b5c145014..b5c145014 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeImpl.java
index 778c188b0..778c188b0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeQualifiedIdentifierReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeQualifiedIdentifierReferenceImpl.java
index 91c4cfa7c..91c4cfa7c 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeQualifiedIdentifierReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeQualifiedIdentifierReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeReferenceImpl.java
index b84a300ff..b84a300ff 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypeReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypeReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypesCatchBlockImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypesCatchBlockImpl.java
index 8da72b263..8da72b263 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/TypesCatchBlockImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/TypesCatchBlockImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryExpressionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryExpressionImpl.java
index e34843d3f..e34843d3f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryExpressionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryExpressionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryMinusImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryMinusImpl.java
index f9c23370b..f9c23370b 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryMinusImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryMinusImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryOperatorImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryOperatorImpl.java
index 8dfcd018e..8dfcd018e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryOperatorImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryOperatorImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryPlusImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryPlusImpl.java
index b246e43ab..b246e43ab 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnaryPlusImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnaryPlusImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnionTypeImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnionTypeImpl.java
index 4496ec7dc..4496ec7dc 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnionTypeImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnionTypeImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnnamedTypeReferenceImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnnamedTypeReferenceImpl.java
index 0bdc3998e..0bdc3998e 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/UnnamedTypeReferenceImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/UnnamedTypeReferenceImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VariableCatchBlockImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VariableCatchBlockImpl.java
index 504ce576f..504ce576f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VariableCatchBlockImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VariableCatchBlockImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VariableDeclarationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VariableDeclarationImpl.java
index 114482ad0..114482ad0 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VariableDeclarationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VariableDeclarationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VariableDefinitionImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VariableDefinitionImpl.java
index 59ed6f065..59ed6f065 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VariableDefinitionImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VariableDefinitionImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VirtualImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VirtualImpl.java
index 964818ed9..964818ed9 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VirtualImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VirtualImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VirtualSpecificationImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VirtualSpecificationImpl.java
index b46eb6294..b46eb6294 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VirtualSpecificationImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VirtualSpecificationImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VoidImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VoidImpl.java
index 9b94067c7..9b94067c7 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/VoidImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/VoidImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/WhileStatementImpl.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/WhileStatementImpl.java
index 46f028e06..46f028e06 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/WhileStatementImpl.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/WhileStatementImpl.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/gastm.ecore b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/gastm.ecore
index 445139f7f..445139f7f 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/impl/gastm.ecore
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/impl/gastm.ecore
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/util/GASTMAdapterFactory.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/util/GASTMAdapterFactory.java
index aecbf811a..aecbf811a 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/util/GASTMAdapterFactory.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/util/GASTMAdapterFactory.java
diff --git a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/util/GASTMSwitch.java b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/util/GASTMSwitch.java
index 562c88fb3..562c88fb3 100644
--- a/org.eclipse.modisco.omg.gastm/src/org/eclipse/modisco/omg/gastm/util/GASTMSwitch.java
+++ b/org.eclipse.modisco.omg.gastm/src-gen/org/eclipse/modisco/omg/gastm/util/GASTMSwitch.java
diff --git a/org.eclipse.modisco.omg.smm/.checkstyle b/org.eclipse.modisco.omg.smm/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.omg.smm/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.omg.smm/.classpath b/org.eclipse.modisco.omg.smm/.classpath
index 2d1a4302f..8aeab6132 100644
--- a/org.eclipse.modisco.omg.smm/.classpath
+++ b/org.eclipse.modisco.omg.smm/.classpath
@@ -2,6 +2,6 @@
 <classpath>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/org.eclipse.modisco.omg.smm/build.properties b/org.eclipse.modisco.omg.smm/build.properties
index bc34ac08b..88729c859 100644
--- a/org.eclipse.modisco.omg.smm/build.properties
+++ b/org.eclipse.modisco.omg.smm/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -6,6 +6,7 @@
 #  

 #  Contributors:

 #      Nicolas Payneau (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 

 bin.includes = .,\

                model/,\

@@ -14,6 +15,6 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.omg.smm/model/SMM-1.0.Beta2.genmodel b/org.eclipse.modisco.omg.smm/model/SMM-1.0.Beta2.genmodel
index 034b210e7..b2d7cd7f8 100644
--- a/org.eclipse.modisco.omg.smm/model/SMM-1.0.Beta2.genmodel
+++ b/org.eclipse.modisco.omg.smm/model/SMM-1.0.Beta2.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2010 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;     Nicolas Payneau (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.omg.smm/src" modelPluginID="org.eclipse.modisco.omg.smm"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;     Nicolas Payneau (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.omg.smm/src-gen" modelPluginID="org.eclipse.modisco.omg.smm"

     modelName="SMM-1.0" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false">

   <foreignModel>SMM-1.0.Beta2.ecore</foreignModel>

diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/AbstractMeasureElement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/AbstractMeasureElement.java
index a4ba7ef76..a4ba7ef76 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/AbstractMeasureElement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/AbstractMeasureElement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Accumulator.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Accumulator.java
index 96b8d7118..96b8d7118 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Accumulator.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Accumulator.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/AggregatedMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/AggregatedMeasurement.java
index 61e8ed732..61e8ed732 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/AggregatedMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/AggregatedMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Annotation.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Annotation.java
index d93ef4acb..d93ef4acb 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Annotation.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Annotation.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Argument.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Argument.java
index dbbeb6887..dbbeb6887 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Argument.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Argument.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Attribute.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Attribute.java
index e50d3084b..e50d3084b 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Attribute.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Attribute.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base1MeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base1MeasureRelationship.java
index e77d74bd6..e77d74bd6 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base1MeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base1MeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base1MeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base1MeasurementRelationship.java
index bbb65d2e0..bbb65d2e0 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base1MeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base1MeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base2MeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base2MeasureRelationship.java
index 4e2014106..4e2014106 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base2MeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base2MeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base2MeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base2MeasurementRelationship.java
index 716bc1d75..716bc1d75 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Base2MeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Base2MeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BaseMeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BaseMeasureRelationship.java
index 7befec21e..7befec21e 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BaseMeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BaseMeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BaseMeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BaseMeasurementRelationship.java
index ec0b853c9..ec0b853c9 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BaseMeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BaseMeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BinaryMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BinaryMeasure.java
index 10b5f8d94..10b5f8d94 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BinaryMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BinaryMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BinaryMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BinaryMeasurement.java
index 21a38f7a9..21a38f7a9 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/BinaryMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/BinaryMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/CategoryRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/CategoryRelationship.java
index 4b5a72875..4b5a72875 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/CategoryRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/CategoryRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Characteristic.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Characteristic.java
index ef2169ac4..ef2169ac4 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Characteristic.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Characteristic.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/CollectiveMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/CollectiveMeasure.java
index f04d62f8e..f04d62f8e 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/CollectiveMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/CollectiveMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/CollectiveMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/CollectiveMeasurement.java
index 1f54cada1..1f54cada1 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/CollectiveMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/CollectiveMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Count.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Count.java
index 4f56957fc..4f56957fc 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Count.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Count.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Counting.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Counting.java
index 4dfa278c2..4dfa278c2 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Counting.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Counting.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DimensionalMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DimensionalMeasure.java
index b60b20f2c..b60b20f2c 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DimensionalMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DimensionalMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DimensionalMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DimensionalMeasurement.java
index 125033531..125033531 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DimensionalMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DimensionalMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DirectMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DirectMeasure.java
index 5a5fe3b90..5a5fe3b90 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DirectMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DirectMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DirectMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DirectMeasurement.java
index c98db60a3..c98db60a3 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/DirectMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/DirectMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/EquivalentMeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/EquivalentMeasureRelationship.java
index 908f82445..908f82445 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/EquivalentMeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/EquivalentMeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/EquivalentMeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/EquivalentMeasurementRelationship.java
index 693357abe..693357abe 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/EquivalentMeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/EquivalentMeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Grade.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Grade.java
index 54ed2b64f..54ed2b64f 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Grade.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Grade.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Measure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Measure.java
index f8d607324..f8d607324 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Measure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Measure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasureCategory.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasureCategory.java
index 78f4fb42c..78f4fb42c 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasureCategory.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasureCategory.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasureLibrary.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasureLibrary.java
index 611e6d08b..611e6d08b 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasureLibrary.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasureLibrary.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasureRelationship.java
index af07e9613..af07e9613 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Measurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Measurement.java
index b6b297c51..b6b297c51 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Measurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Measurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasurementRelationship.java
index 6edb96b59..6edb96b59 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/MeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/MeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/NamedMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/NamedMeasure.java
index e15b1aae2..e15b1aae2 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/NamedMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/NamedMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/NamedMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/NamedMeasurement.java
index 6ed2e7874..6ed2e7874 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/NamedMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/NamedMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/OCLOperation.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/OCLOperation.java
index 34bb0eb54..34bb0eb54 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/OCLOperation.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/OCLOperation.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Observation.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Observation.java
index 712afd768..712afd768 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Observation.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Observation.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/ObservationScope.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/ObservationScope.java
index e6f2b1e8d..e6f2b1e8d 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/ObservationScope.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/ObservationScope.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/ObservedMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/ObservedMeasure.java
index 8723ac94e..8723ac94e 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/ObservedMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/ObservedMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Operation.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Operation.java
index 605777e26..605777e26 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Operation.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Operation.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Ranking.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Ranking.java
index a9748dc5b..a9748dc5b 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Ranking.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Ranking.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RankingInterval.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RankingInterval.java
index a4bf42e02..a4bf42e02 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RankingInterval.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RankingInterval.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RankingMeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RankingMeasureRelationship.java
index 2def3dd77..2def3dd77 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RankingMeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RankingMeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RankingMeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RankingMeasurementRelationship.java
index 8089afcf5..8089afcf5 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RankingMeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RankingMeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RatioMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RatioMeasure.java
index 062886c83..062886c83 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RatioMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RatioMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RatioMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RatioMeasurement.java
index cd631ca0a..cd631ca0a 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RatioMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RatioMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RecursiveMeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RecursiveMeasureRelationship.java
index 3f65b4e60..3f65b4e60 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RecursiveMeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RecursiveMeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RecursiveMeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RecursiveMeasurementRelationship.java
index d704d8257..d704d8257 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RecursiveMeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RecursiveMeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RefinementMeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RefinementMeasureRelationship.java
index 63ff0b7cf..63ff0b7cf 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RefinementMeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RefinementMeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RefinementMeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RefinementMeasurementRelationship.java
index 953d23d1b..953d23d1b 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RefinementMeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RefinementMeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaleMeasureRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaleMeasureRelationship.java
index 22bd4a4f5..22bd4a4f5 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaleMeasureRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaleMeasureRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaleMeasurementRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaleMeasurementRelationship.java
index c4df071f0..c4df071f0 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaleMeasurementRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaleMeasurementRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaledMeasure.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaledMeasure.java
index 7f8edcbaf..7f8edcbaf 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaledMeasure.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaledMeasure.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaledMeasurement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaledMeasurement.java
index 78104e1da..78104e1da 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/RescaledMeasurement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/RescaledMeasurement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Scope.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Scope.java
index cefc10a0d..cefc10a0d 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/Scope.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/Scope.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmElement.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmElement.java
index 7275e5ab0..7275e5ab0 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmElement.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmElement.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmFactory.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmFactory.java
index 5b01ab0cc..5b01ab0cc 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmFactory.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmFactory.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmModel.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmModel.java
index 3c1a260c1..3c1a260c1 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmModel.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmModel.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmPackage.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmPackage.java
index 1ac9c25a7..1ac9c25a7 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmPackage.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmPackage.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmRelationship.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmRelationship.java
index d5c9e8827..d5c9e8827 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/SmmRelationship.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/SmmRelationship.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AbstractMeasureElementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AbstractMeasureElementImpl.java
index 1c58eb508..1c58eb508 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AbstractMeasureElementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AbstractMeasureElementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AggregatedMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AggregatedMeasurementImpl.java
index c597c72dd..c597c72dd 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AggregatedMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AggregatedMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AnnotationImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AnnotationImpl.java
index 54fcc57c0..54fcc57c0 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AnnotationImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AnnotationImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ArgumentImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ArgumentImpl.java
index 2a4b6e360..2a4b6e360 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ArgumentImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ArgumentImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AttributeImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AttributeImpl.java
index 3c6095360..3c6095360 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/AttributeImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/AttributeImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base1MeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base1MeasureRelationshipImpl.java
index 6b87dae8d..6b87dae8d 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base1MeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base1MeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base1MeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base1MeasurementRelationshipImpl.java
index f63df0348..f63df0348 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base1MeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base1MeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base2MeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base2MeasureRelationshipImpl.java
index df0fd2ec2..df0fd2ec2 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base2MeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base2MeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base2MeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base2MeasurementRelationshipImpl.java
index eb1b20820..eb1b20820 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/Base2MeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/Base2MeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BaseMeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BaseMeasureRelationshipImpl.java
index 9c02b4cfe..9c02b4cfe 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BaseMeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BaseMeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BaseMeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BaseMeasurementRelationshipImpl.java
index 791c823ae..791c823ae 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BaseMeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BaseMeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BinaryMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BinaryMeasureImpl.java
index 007b89f2e..007b89f2e 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BinaryMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BinaryMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BinaryMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BinaryMeasurementImpl.java
index 2bd6bd0ac..2bd6bd0ac 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/BinaryMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/BinaryMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CategoryRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CategoryRelationshipImpl.java
index 9d0aa5d8a..9d0aa5d8a 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CategoryRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CategoryRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CharacteristicImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CharacteristicImpl.java
index 0655b8eb1..0655b8eb1 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CharacteristicImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CharacteristicImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CollectiveMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CollectiveMeasureImpl.java
index c88d3e78a..c88d3e78a 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CollectiveMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CollectiveMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CollectiveMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CollectiveMeasurementImpl.java
index 0bc775456..0bc775456 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CollectiveMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CollectiveMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CountImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CountImpl.java
index 8c0d9bfbb..8c0d9bfbb 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CountImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CountImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CountingImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CountingImpl.java
index ef695e68f..ef695e68f 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/CountingImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/CountingImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DimensionalMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DimensionalMeasureImpl.java
index f36a8775f..f36a8775f 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DimensionalMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DimensionalMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DimensionalMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DimensionalMeasurementImpl.java
index 25074f456..25074f456 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DimensionalMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DimensionalMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DirectMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DirectMeasureImpl.java
index cc7cd3f01..cc7cd3f01 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DirectMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DirectMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DirectMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DirectMeasurementImpl.java
index 404ab9032..404ab9032 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/DirectMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/DirectMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/EquivalentMeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/EquivalentMeasureRelationshipImpl.java
index e7a083b1d..e7a083b1d 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/EquivalentMeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/EquivalentMeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/EquivalentMeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/EquivalentMeasurementRelationshipImpl.java
index a5554cd22..a5554cd22 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/EquivalentMeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/EquivalentMeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/GradeImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/GradeImpl.java
index a73443243..a73443243 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/GradeImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/GradeImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureCategoryImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureCategoryImpl.java
index d87044759..d87044759 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureCategoryImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureCategoryImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureImpl.java
index 74bd0c8ed..74bd0c8ed 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureLibraryImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureLibraryImpl.java
index c9591407d..c9591407d 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureLibraryImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureLibraryImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureRelationshipImpl.java
index e8d702782..e8d702782 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasurementImpl.java
index 8048d6346..8048d6346 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasurementRelationshipImpl.java
index af39883a4..af39883a4 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/MeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/MeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/NamedMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/NamedMeasureImpl.java
index 4f9731076..4f9731076 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/NamedMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/NamedMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/NamedMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/NamedMeasurementImpl.java
index 7e739366f..7e739366f 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/NamedMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/NamedMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/OCLOperationImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/OCLOperationImpl.java
index f7ac013d4..f7ac013d4 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/OCLOperationImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/OCLOperationImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ObservationImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ObservationImpl.java
index 7802468c3..7802468c3 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ObservationImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ObservationImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ObservationScopeImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ObservationScopeImpl.java
index deb22fd6f..deb22fd6f 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ObservationScopeImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ObservationScopeImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ObservedMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ObservedMeasureImpl.java
index 58b4b94f8..58b4b94f8 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ObservedMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ObservedMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/OperationImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/OperationImpl.java
index 5451fe566..5451fe566 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/OperationImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/OperationImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingImpl.java
index da91364f0..da91364f0 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingIntervalImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingIntervalImpl.java
index 9b1123889..9b1123889 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingIntervalImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingIntervalImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingMeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingMeasureRelationshipImpl.java
index 7bbf3ebb0..7bbf3ebb0 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingMeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingMeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingMeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingMeasurementRelationshipImpl.java
index b996bbb41..b996bbb41 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RankingMeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RankingMeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RatioMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RatioMeasureImpl.java
index 876403c01..876403c01 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RatioMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RatioMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RatioMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RatioMeasurementImpl.java
index e4a91b713..e4a91b713 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RatioMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RatioMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RecursiveMeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RecursiveMeasureRelationshipImpl.java
index ffa3771a2..ffa3771a2 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RecursiveMeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RecursiveMeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RecursiveMeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RecursiveMeasurementRelationshipImpl.java
index 26c756592..26c756592 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RecursiveMeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RecursiveMeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RefinementMeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RefinementMeasureRelationshipImpl.java
index 39e7d0874..39e7d0874 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RefinementMeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RefinementMeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RefinementMeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RefinementMeasurementRelationshipImpl.java
index 0f62d3872..0f62d3872 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RefinementMeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RefinementMeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaleMeasureRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaleMeasureRelationshipImpl.java
index 79b0a8d8d..79b0a8d8d 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaleMeasureRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaleMeasureRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaleMeasurementRelationshipImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaleMeasurementRelationshipImpl.java
index d25b794af..d25b794af 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaleMeasurementRelationshipImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaleMeasurementRelationshipImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaledMeasureImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaledMeasureImpl.java
index b6aafe19b..b6aafe19b 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaledMeasureImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaledMeasureImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaledMeasurementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaledMeasurementImpl.java
index 582d2aca7..582d2aca7 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/RescaledMeasurementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/RescaledMeasurementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ScopeImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ScopeImpl.java
index 8089c01e9..8089c01e9 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/ScopeImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/ScopeImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmElementImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmElementImpl.java
index c4fde2739..c4fde2739 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmElementImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmElementImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmFactoryImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmFactoryImpl.java
index cb2588af6..cb2588af6 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmFactoryImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmFactoryImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmModelImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmModelImpl.java
index 8bd21a380..8bd21a380 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmModelImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmModelImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmPackageImpl.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmPackageImpl.java
index 55b7930fb..55b7930fb 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/impl/SmmPackageImpl.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/impl/SmmPackageImpl.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/util/SmmAdapterFactory.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/util/SmmAdapterFactory.java
index d9af0d5f7..d9af0d5f7 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/util/SmmAdapterFactory.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/util/SmmAdapterFactory.java
diff --git a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/util/SmmSwitch.java b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/util/SmmSwitch.java
index a85ff9190..a85ff9190 100644
--- a/org.eclipse.modisco.omg.smm/src/org/eclipse/modisco/omg/smm/util/SmmSwitch.java
+++ b/org.eclipse.modisco.omg.smm/src-gen/org/eclipse/modisco/omg/smm/util/SmmSwitch.java
diff --git a/org.eclipse.modisco.properties.discoverer.ui/.checkstyle b/org.eclipse.modisco.properties.discoverer.ui/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.properties.discoverer.ui/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.properties.discoverer/.checkstyle b/org.eclipse.modisco.properties.discoverer/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.properties.discoverer/.checkstyle
+++ b/org.eclipse.modisco.properties.discoverer/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java b/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java
index dd97cf6da..36941c0aa 100644
--- a/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java
+++ b/org.eclipse.modisco.properties.discoverer/src/org/eclipse/modisco/properties/discoverer/Activator.java
@@ -25,7 +25,7 @@ public class Activator extends Plugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.smm.quality/.checkstyle b/org.eclipse.modisco.smm.quality/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.smm.quality/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.smm.quality/.classpath b/org.eclipse.modisco.smm.quality/.classpath
index efdacce14..093895c1b 100644
--- a/org.eclipse.modisco.smm.quality/.classpath
+++ b/org.eclipse.modisco.smm.quality/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

-	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.smm.quality/build.properties b/org.eclipse.modisco.smm.quality/build.properties
index 046a4f355..6d389ed8c 100644
--- a/org.eclipse.modisco.smm.quality/build.properties
+++ b/org.eclipse.modisco.smm.quality/build.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2010 Mia-Software.

+# Copyright (c) 2010, 2018 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

@@ -6,6 +6,7 @@
 #  

 #  Contributors:

 #      Nicolas Payneau (Mia-Software) - initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 

 bin.includes = .,\

                model/,\

@@ -13,5 +14,5 @@ bin.includes = .,\
                plugin.xml,\

                plugin.properties

 jars.compile.order = .

-source.. = src/

+source.. = src-gen/

 output.. = bin/

diff --git a/org.eclipse.modisco.smm.quality/model/SMMQuality.genmodel b/org.eclipse.modisco.smm.quality/model/SMMQuality.genmodel
index e029685a4..462877dfe 100644
--- a/org.eclipse.modisco.smm.quality/model/SMMQuality.genmodel
+++ b/org.eclipse.modisco.smm.quality/model/SMMQuality.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2010 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;     Nicolas Payneau (Mia-Software) - initial API and implementation"

-    modelDirectory="/org.eclipse.modisco.smm.quality/src" modelPluginID="org.eclipse.modisco.smm.quality"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2010, 2018 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;     Nicolas Payneau (Mia-Software) - initial API and implementation&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.smm.quality/src-gen" modelPluginID="org.eclipse.modisco.smm.quality"

     modelName="SMMQuality" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"

     copyrightFields="false" usedGenPackages="platform:/plugin/org.eclipse.modisco.omg.smm/model/SMM-1.0.Beta2.genmodel#//smm">

   <foreignModel>SMMQuality.ecore</foreignModel>

diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/Measurand.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/Measurand.java
index 8e94766b1..8e94766b1 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/Measurand.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/Measurand.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/QualityScope.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/QualityScope.java
index aa706d267..aa706d267 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/QualityScope.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/QualityScope.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/SmmqualityFactory.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/SmmqualityFactory.java
index 25b261604..25b261604 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/SmmqualityFactory.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/SmmqualityFactory.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/SmmqualityPackage.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/SmmqualityPackage.java
index 7c6a98c22..7c6a98c22 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/SmmqualityPackage.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/SmmqualityPackage.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/MeasurandImpl.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/MeasurandImpl.java
index fd757c314..fd757c314 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/MeasurandImpl.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/MeasurandImpl.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/QualityScopeImpl.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/QualityScopeImpl.java
index 1e30df35e..1e30df35e 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/QualityScopeImpl.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/QualityScopeImpl.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/SmmqualityFactoryImpl.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/SmmqualityFactoryImpl.java
index 9447f122c..9447f122c 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/SmmqualityFactoryImpl.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/SmmqualityFactoryImpl.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/SmmqualityPackageImpl.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/SmmqualityPackageImpl.java
index 1a40d0a2b..1a40d0a2b 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/impl/SmmqualityPackageImpl.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/impl/SmmqualityPackageImpl.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/util/SmmqualityAdapterFactory.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/util/SmmqualityAdapterFactory.java
index ff8eb1fe5..ff8eb1fe5 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/util/SmmqualityAdapterFactory.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/util/SmmqualityAdapterFactory.java
diff --git a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/util/SmmqualitySwitch.java b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/util/SmmqualitySwitch.java
index bd13b92d4..bd13b92d4 100644
--- a/org.eclipse.modisco.smm.quality/src/org/eclipse/modisco/smm/quality/util/SmmqualitySwitch.java
+++ b/org.eclipse.modisco.smm.quality/src-gen/org/eclipse/modisco/smm/quality/util/SmmqualitySwitch.java
diff --git a/org.eclipse.modisco.tests/.checkstyle b/org.eclipse.modisco.tests/.checkstyle
index 2ea6813c0..8cf679feb 100644
--- a/org.eclipse.modisco.tests/.checkstyle
+++ b/org.eclipse.modisco.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.checkstyle
+++ b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Activator.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Activator.java
index 06464996f..f997e11e5 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Activator.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Messages.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Messages.java
index c0ffecdcb..429f00615 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Messages.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/Messages.java
@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 /**

  * @author GBarbier

- * 

+ *

  */

 public final class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui.internal.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/PrefuseGraphContainerForJava.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/PrefuseGraphContainerForJava.java
index a3ac90c5a..895d76839 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/PrefuseGraphContainerForJava.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/PrefuseGraphContainerForJava.java
@@ -43,7 +43,7 @@ public final class PrefuseGraphContainerForJava extends PrefuseGraphContainer {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.gmt.modisco.infra.prefuse.PrefuseGraphContainer#initializeTreeViewContainer(prefuse

 	 * .data.Graph, java.lang.String)

@@ -54,7 +54,7 @@ public final class PrefuseGraphContainerForJava extends PrefuseGraphContainer {
 		ControlAdapter controlAdapter = new ControlAdapter() {

 			/*

 			 * (non-Javadoc)

-			 * 

+			 *

 			 * @see prefuse.controls.ControlAdapter#itemClicked(prefuse.visual.VisualItem,

 			 * java.awt.event.MouseEvent)

 			 */

@@ -66,7 +66,7 @@ public final class PrefuseGraphContainerForJava extends PrefuseGraphContainer {
 				if ((e.getButton() == MouseEvent.BUTTON1) && (e.getClickCount() > 1)) {

 					/*

 					 * We get the source object (Node) with method "item.getSourceTuple()"

-					 * 

+					 *

 					 * From the tuple, we could get the source java operation (underground

 					 * attribute)

 					 */

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/MethodCallsModelEditor.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/MethodCallsModelEditor.java
index 906a0fa48..33684242c 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/MethodCallsModelEditor.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/MethodCallsModelEditor.java
@@ -56,7 +56,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @seeorg.eclipse.ui.part.EditorPart#doSave(org.eclipse.core.runtime.

 	 * IProgressMonitor)

 	 */

@@ -67,7 +67,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.part.EditorPart#doSaveAs()

 	 */

 	@Override

@@ -77,7 +77,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.part.EditorPart#init(org.eclipse.ui.IEditorSite,

 	 * org.eclipse.ui.IEditorInput)

 	 */

@@ -114,7 +114,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.part.EditorPart#isDirty()

 	 */

 	@Override

@@ -124,7 +124,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.part.EditorPart#isSaveAsAllowed()

 	 */

 	@Override

@@ -134,7 +134,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets

 	 * .Composite)

@@ -166,7 +166,7 @@ public class MethodCallsModelEditor extends EditorPart {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.part.WorkbenchPart#setFocus()

 	 */

 	@Override

@@ -252,7 +252,7 @@ public class MethodCallsModelEditor extends EditorPart {
 				/*

 				 * Check that parent type is an interface ? if yes, we would

 				 * like to continue the graph with implementations class/methods

-				 * 

+				 *

 				 * A better check could be to test body of the method: no body =

 				 * abstract method All cases are handled, no matter if it is an

 				 * interface or an abstract class !

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/PrefuseGraphInput.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/PrefuseGraphInput.java
index 1aa738dc1..88b4dd4fa 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/PrefuseGraphInput.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/ui/internal/editor/PrefuseGraphInput.java
@@ -62,7 +62,7 @@ public class PrefuseGraphInput implements IEditorInput {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.IEditorInput#exists()

 	 */

 	public boolean exists() {

@@ -71,7 +71,7 @@ public class PrefuseGraphInput implements IEditorInput {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.IEditorInput#getImageDescriptor()

 	 */

 	public ImageDescriptor getImageDescriptor() {

@@ -80,7 +80,7 @@ public class PrefuseGraphInput implements IEditorInput {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.IEditorInput#getName()

 	 */

 	public String getName() {

@@ -89,7 +89,7 @@ public class PrefuseGraphInput implements IEditorInput {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.IEditorInput#getPersistable()

 	 */

 	public IPersistableElement getPersistable() {

@@ -98,7 +98,7 @@ public class PrefuseGraphInput implements IEditorInput {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.ui.IEditorInput#getToolTipText()

 	 */

 	public String getToolTipText() {

@@ -107,7 +107,7 @@ public class PrefuseGraphInput implements IEditorInput {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class)

 	 */

 	@SuppressWarnings("rawtypes") // conform to interface signature

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/.checkstyle
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/Activator.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/Activator.java
index a1ecffa3d..333d21b29 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/Activator.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/Activator.java
@@ -37,7 +37,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/converter/MethodCallsGraphConverter.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/converter/MethodCallsGraphConverter.java
index a50f23247..1c5b174c8 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/converter/MethodCallsGraphConverter.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/discoverer/internal/converter/MethodCallsGraphConverter.java
@@ -57,7 +57,7 @@ public class MethodCallsGraphConverter {
 	/**

 	 * From a java resource, we will compute method calls graph then initialize

 	 * a method calls model.

-	 * 

+	 *

 	 * @param javaResource

 	 * @return corresponding method calls model

 	 */

@@ -183,10 +183,10 @@ public class MethodCallsGraphConverter {
 

 	/**

 	 * To retrieve all method declarations from java model.

-	 * 

+	 *

 	 * We will also initialize collections of types and method invocations to

 	 * iterate only once on all java elements.

-	 * 

+	 *

 	 * @param javaResource

 	 * @return

 	 */

@@ -215,7 +215,7 @@ public class MethodCallsGraphConverter {
 	 * have to select all usages which are contained by this method declaration.

 	 * It means all instances of AbstractMethodInvocation Yet, we have also to

 	 * sort this collection by its order in call sequence

-	 * 

+	 *

 	 * @param parent

 	 * @return

 	 */

@@ -230,7 +230,7 @@ public class MethodCallsGraphConverter {
 	/**

 	 * To retrieve all method invocations that are contained by this method

 	 * declaration element.

-	 * 

+	 *

 	 * @param parent

 	 * @return

 	 */

@@ -250,7 +250,7 @@ public class MethodCallsGraphConverter {
 	 * method invocation. Type of parameter element is EObject, because we have

 	 * to navigate into statements hierarchy which many different kinds of

 	 * elements

-	 * 

+	 *

 	 * @param element

 	 * @return

 	 */

@@ -275,7 +275,7 @@ public class MethodCallsGraphConverter {
 			/*

 			 * Initially, I used location in file to sort invocations, but

 			 * needed information is no longer retained in java model ...

-			 * 

+			 *

 			 * Perhaps could I use index of parent element which is directly

 			 * contained in block statement of the declaring method ?

 			 */

@@ -289,7 +289,7 @@ public class MethodCallsGraphConverter {
 				/*

 				 * specific case: both invocations have the same index and are

 				 * contained in the same block.

-				 * 

+				 *

 				 * So we have to retrieve first common parent block and use it

 				 * to compute index ...

 				 */

@@ -335,7 +335,7 @@ public class MethodCallsGraphConverter {
 		 * from an example: block A contains another block B (with other

 		 * statements) block B contains two blocks C and D which contains

 		 * respectively element1 and element2

-		 * 

+		 *

 		 * Here the algorithm: From element1, I get the nearest parent block

 		 * Then I will iterate on all parent blocks of element2 and test

 		 * identity If not found, I have to iterate on parent block of element1

@@ -384,7 +384,7 @@ public class MethodCallsGraphConverter {
 	/**

 	 * To retrieve the type declaration which contains source element (which is

 	 * at the beginning a method declaration element)

-	 * 

+	 *

 	 * @param element

 	 * @return

 	 */

@@ -402,7 +402,7 @@ public class MethodCallsGraphConverter {
 

 	/**

 	 * To retrieve all sub types of parameter (type declaration element)

-	 * 

+	 *

 	 * @param contextClass

 	 * @return

 	 */

@@ -423,7 +423,7 @@ public class MethodCallsGraphConverter {
 	/**

 	 * To compute a boolean which indicate if a type (self) is in parent

 	 * hierarchy of an other type (typeDeclaration).

-	 * 

+	 *

 	 * @param self

 	 * @param typeDeclaration

 	 * @return true if self is a super type of typeDeclaration

@@ -522,7 +522,7 @@ public class MethodCallsGraphConverter {
 				} else if (expression instanceof SingleVariableAccess) {

 					/*

 					 * potential infinite recursion

-					 * 

+					 *

 					 * Object tmp; Object src = tmp; ... tmp = src;

 					 */

 					SingleVariableAccess singleVariableAccess = (SingleVariableAccess) expression;

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.methodcalls/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/.classpath b/org.eclipse.modisco.usecase.modelfilter.methodcalls/.classpath
index 45f024e85..e5fbd3dd2 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/.classpath
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/build.properties b/org.eclipse.modisco.usecase.modelfilter.methodcalls/build.properties
index cf7475f60..fae7a2c75 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/build.properties
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2010, 2011 Mia-Software.
+# Copyright (c) 2010, 2018 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
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #    Gabriel Barbier (Mia-Software) - initial API and implementation
+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings
 ###############################################################################
 bin.includes = META-INF/,\
                .,\
@@ -15,7 +16,8 @@ bin.includes = META-INF/,\
                resources/,\
                about.html,\
                OSGI-INF/
-source.. = src/
+source.. = src/,\
+           src-gen/
 output.. = bin/
 src.includes = about.html
 

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/model/MethodCalls.genmodel b/org.eclipse.modisco.usecase.modelfilter.methodcalls/model/MethodCalls.genmodel
index df4369623..b2b44bb0d 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/model/MethodCalls.genmodel
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/model/MethodCalls.genmodel
@@ -1,7 +1,7 @@
 <?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="Copyright (c) 2011 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;    Gabriel Barbier (Mia-Software) - initial API and implementation&#xD;&#xA;    Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework"

-    modelDirectory="/org.eclipse.modisco.usecase.modelfilter.methodcalls/src" editDirectory="/org.eclipse.modisco.usecase.modelfilter.methodcalls.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2011, 2018 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;    Gabriel Barbier (Mia-Software) - initial API and implementation&#xD;&#xA;    Nicolas Bros (Mia-Software) - Bug 335003 - [Discoverer] : Existing Discoverers Refactoring based on new framework&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen" editDirectory="/org.eclipse.modisco.usecase.modelfilter.methodcalls.edit/src"

     editorDirectory="/org.eclipse.modisco.usecase.modelfilter.methodcalls.editor/src"

     modelPluginID="org.eclipse.modisco.usecase.modelfilter.methodcalls" modelName="MethodCalls"

     editPluginClass="org.eclipse.modisco.usecase.modelfilter.methodcalls.model.methodcalls.provider.MethodCallsEditPlugin"

diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallNode.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallNode.java
index af4c4f894..af4c4f894 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallNode.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallNode.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallsModel.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallsModel.java
index 06a253643..06a253643 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallsModel.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/CallsModel.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodCall.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodCall.java
index 1eafda37c..1eafda37c 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodCall.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodCall.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsFactory.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsFactory.java
index e13bc97a9..e13bc97a9 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsFactory.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsFactory.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsPackage.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsPackage.java
index 6d98a1e43..6d98a1e43 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsPackage.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/MethodcallsPackage.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallNodeImpl.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallNodeImpl.java
index 510673062..510673062 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallNodeImpl.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallNodeImpl.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallsModelImpl.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallsModelImpl.java
index 3478c4cae..3478c4cae 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallsModelImpl.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/CallsModelImpl.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodCallImpl.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodCallImpl.java
index 0a4d17f3d..0a4d17f3d 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodCallImpl.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodCallImpl.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsFactoryImpl.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsFactoryImpl.java
index d2df901c8..d2df901c8 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsFactoryImpl.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsFactoryImpl.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsPackageImpl.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsPackageImpl.java
index b274b1e22..b274b1e22 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsPackageImpl.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/impl/MethodcallsPackageImpl.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsAdapterFactory.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsAdapterFactory.java
index fa7b6ed9d..fa7b6ed9d 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsAdapterFactory.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsAdapterFactory.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsSwitch.java b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsSwitch.java
index 45938f5c7..45938f5c7 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/src/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsSwitch.java
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/src-gen/org/eclipse/modisco/usecase/modelfilter/methodcalls/methodcalls/util/MethodcallsSwitch.java
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle
index d18c65877..6bd51546b 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/Activator.java b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/Activator.java
index fb7d9f0ee..248f6545e 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/Activator.java
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/Activator.java
@@ -13,7 +13,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/JavaProjectFactory.java b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/JavaProjectFactory.java
index 3f7c6e9e6..d0d3752ac 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/JavaProjectFactory.java
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/JavaProjectFactory.java
@@ -35,7 +35,7 @@ import org.eclipse.jdt.launching.JavaRuntime;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class JavaProjectFactory {

 

diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java
index 320d10177..9ec2e86a1 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/src/org/eclipse/modisco/usecase/modelfilter/tests/SimpleBlackBoxDiscovery.java
@@ -40,7 +40,7 @@ import org.osgi.framework.Bundle;
 

 /**

  * @author Gabriel Barbier

- * 

+ *

  */

 public class SimpleBlackBoxDiscovery {

 	// To be able to export reference model after a change in java discovery

@@ -104,7 +104,7 @@ public class SimpleBlackBoxDiscovery {
 	@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=468346

 	@Test

 	public void testUmlModelFromJavaProjectWithReferenceModel()

-			throws CoreException, IOException, InterruptedException, 

+			throws CoreException, IOException, InterruptedException,

 			DiscoveryException {

 		Assert.assertNotNull(this.javaPrjFactory);

 		final IJavaProject javaProject = this.javaPrjFactory.getJavaProject();

@@ -124,12 +124,12 @@ public class SimpleBlackBoxDiscovery {
 		 * Because everything looks great, well we have to test model

 		 * content. In details we will compare current resource with a

 		 * reference (checked manually)

-		 * 

+		 *

 		 * Warning, because the java model store the "filepath" of

 		 * discovered java code, the compilation units elements could not be

 		 * the same !!!!

 		 */

-		final String referencePath = "/" + Activator.PLUGIN_ID + REF_FOLDER_PATH + PROJECT_NAME //$NON-NLS-1$ 

+		final String referencePath = "/" + Activator.PLUGIN_ID + REF_FOLDER_PATH + PROJECT_NAME //$NON-NLS-1$

 				+ "RealTypes" + UML_MODEL_EXT; //$NON-NLS-1$

 		final URI referenceUri = URI.createPlatformPluginURI(referencePath, true);

 		Assert.assertNotNull(referenceUri);

@@ -143,7 +143,7 @@ public class SimpleBlackBoxDiscovery {
 

 	@Ignore //cf. https://bugs.eclipse.org/bugs/show_bug.cgi?id=474705

 	@Test

-	public void testValidationOfUmlModelDiscoveryFromJavaProject() 

+	public void testValidationOfUmlModelDiscoveryFromJavaProject()

 			throws DiscoveryException, CoreException {

 		Assert.assertNotNull(this.javaPrjFactory);

 		final IJavaProject javaProject = this.javaPrjFactory.getJavaProject();

diff --git a/org.eclipse.modisco.usecase.modelfilter.ui/.checkstyle b/org.eclipse.modisco.usecase.modelfilter.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.usecase.modelfilter.ui/.checkstyle
+++ b/org.eclipse.modisco.usecase.modelfilter.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.usecase.modelfilter.ui/src/org/eclipse/modisco/usecase/modelfilter/ui/internal/Activator.java b/org.eclipse.modisco.usecase.modelfilter.ui/src/org/eclipse/modisco/usecase/modelfilter/ui/internal/Activator.java
index 10cac3072..98869b1fb 100644
--- a/org.eclipse.modisco.usecase.modelfilter.ui/src/org/eclipse/modisco/usecase/modelfilter/ui/internal/Activator.java
+++ b/org.eclipse.modisco.usecase.modelfilter.ui/src/org/eclipse/modisco/usecase/modelfilter/ui/internal/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
 

 	// The shared instance

 	private static Activator plugin;

-	

+

 	/**

 	 * The constructor

 	 */

diff --git a/org.eclipse.modisco.usecase.modelfilter/.checkstyle b/org.eclipse.modisco.usecase.modelfilter/.checkstyle
index b92746e9d..cc930e4a0 100644
--- a/org.eclipse.modisco.usecase.modelfilter/.checkstyle
+++ b/org.eclipse.modisco.usecase.modelfilter/.checkstyle
@@ -1,12 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
   </fileset>
-  <filter name="FilesFromPackage" enabled="false">
-    <filter-data value="src/org/eclipse/gmt/modisco/usecases/modelfilter/modelfilterproperties"/>
-  </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.ui/.checkstyle b/org.eclipse.modisco.usecase.simpletransformationschain.ui/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain.ui/.checkstyle
+++ b/org.eclipse.modisco.usecase.simpletransformationschain.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.ui/src/org/eclipse/modisco/usecase/simpletransformationschain/ui/internal/Activator.java b/org.eclipse.modisco.usecase.simpletransformationschain.ui/src/org/eclipse/modisco/usecase/simpletransformationschain/ui/internal/Activator.java
index 58c59e2d1..6e69734dc 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain.ui/src/org/eclipse/modisco/usecase/simpletransformationschain/ui/internal/Activator.java
+++ b/org.eclipse.modisco.usecase.simpletransformationschain.ui/src/org/eclipse/modisco/usecase/simpletransformationschain/ui/internal/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/.checkstyle b/org.eclipse.modisco.usecase.simpletransformationschain/.checkstyle
index 8379f4f3f..f8f865f39 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain/.checkstyle
+++ b/org.eclipse.modisco.usecase.simpletransformationschain/.checkstyle
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
-  <filter name="FilesFromPackage" enabled="true">
-    <filter-data value="src/org/eclipse/gmt/modisco/usecase/simpletransformationschain/model"/>
-  </filter>
 </fileset-config>
diff --git a/org.eclipse.modisco.util.atl.core/.checkstyle b/org.eclipse.modisco.util.atl.core/.checkstyle
index 2734ddde7..194bec515 100644
--- a/org.eclipse.modisco.util.atl.core/.checkstyle
+++ b/org.eclipse.modisco.util.atl.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="MoDisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
diff --git a/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/Activator.java b/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/Activator.java
index c3bb8c0c4..c50d66c7a 100644
--- a/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/Activator.java
+++ b/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/Activator.java
@@ -26,7 +26,7 @@ public class Activator extends Plugin {
 
 	/**
 	 * Returns the shared instance
-	 * 
+	 *
 	 * @return the shared instance
 	 */
 	public static Activator getDefault() {
diff --git a/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/AtlLaunchHelper.java b/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/AtlLaunchHelper.java
index 446afc47a..62573e4a6 100644
--- a/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/AtlLaunchHelper.java
+++ b/org.eclipse.modisco.util.atl.core/src/org/eclipse/modisco/util/atl/core/internal/AtlLaunchHelper.java
@@ -37,7 +37,7 @@ import org.eclipse.m2m.atl.engine.vm.nativelib.ASMModel;
 

 /**

  * @author gbarbier

- * 

+ *

  */

 public class AtlLaunchHelper {

 

diff --git a/org.eclipse.modisco.util.emf.core/.checkstyle b/org.eclipse.modisco.util.emf.core/.checkstyle
index f34270bb0..99b526602 100644
--- a/org.eclipse.modisco.util.emf.core/.checkstyle
+++ b/org.eclipse.modisco.util.emf.core/.checkstyle
@@ -10,7 +10,7 @@ Contributors:
    Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in

 -->

 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">

-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>

+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>

   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">

     <file-match-pattern match-pattern="." include-pattern="true"/>

     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>

diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java
index 2183cb58a..ffef4dea9 100644
--- a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java
@@ -4,7 +4,7 @@
  * 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:

  *    Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in

  */

@@ -23,11 +23,11 @@ import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstance
  * @since 1.0.0

  */

 public final class AllInstancesUtils {

-	

+

 	private AllInstancesUtils() {

 		// Must not be used

 	}

-	

+

 	public static List<EObject> allInstances(final EClass eClass,

 			final Resource resource, final boolean includingSubTypes) {

 		final List<EObject> result = new ArrayList<EObject>();

diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java
index 8d34bed86..501b44688 100644
--- a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java
@@ -4,7 +4,7 @@
  * 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:

  *    Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in

  */

diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java
index 36c3c53be..5f69cde75 100644
--- a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EObject;
 public interface MetaclassInstances {

 	/**

 	 * Return the list of instances for the given metaclass

-	 * 

+	 *

 	 * @param eClass

 	 *            the metaclass

 	 * @param includingSubclasses

diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java
index a6e577a94..0efff1d47 100644
--- a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java
@@ -60,7 +60,7 @@ public class MetaclassInstancesAdapter extends AdapterImpl implements MetaclassI
 	private Map<EClass, Set<EObject>> instancesByEClass;

 	/** All the model elements of the metaclass or one of its sub-types */

 	private Map<EClass, Set<EObject>> instancesByType;

-	

+

 	/** Indicates if cache has been cleared and must be computed at next access */

 	private boolean cacheInvalidated;

 

@@ -78,14 +78,14 @@ public class MetaclassInstancesAdapter extends AdapterImpl implements MetaclassI
 			clearAndComputeCache();

 		}

 	}

-	

+

 	protected void clearAndComputeCache() {

 		synchronized (this) {

 			this.instancesByEClass = new HashMap<EClass, Set<EObject>>();

 			this.instancesByType = new HashMap<EClass, Set<EObject>>();

-	

+

 			final TransactionalEditingDomain transactDomain = getTransactionalEditingDomain(this.resource);

-	

+

 			if (transactDomain == null) {

 				// Standard case

 				computeCache();

@@ -98,33 +98,33 @@ public class MetaclassInstancesAdapter extends AdapterImpl implements MetaclassI
 						}

 					});

 				} catch (InterruptedException e) {

-					Logger.logWarning(e, 

+					Logger.logWarning(e,

 							"InterruptedException during Model allOfClass computing.", Activator.getDefault()); //$NON-NLS-1$

 					// task was interrupted, trying without exclusive access

 					computeCache();

 				}

 			}

-			

+

 			this.cacheInvalidated = false;

 		}

 	}

-	

+

 	public void clearCache() {

 		synchronized (this) {

 			this.instancesByEClass = new HashMap<EClass, Set<EObject>>();

 			this.instancesByType = new HashMap<EClass, Set<EObject>>();

-			

+

 			this.cacheInvalidated = true;

 		}

 	}

-	

+

 	private void validateCache() {

 		if (this.cacheInvalidated) {

 			clearAndComputeCache();

 		}

 		this.cacheInvalidated = false;

 	}

-	

+

 	private void computeCache() {

 		final TreeIterator<EObject> allContents = this.resource.getAllContents();

 		while (allContents.hasNext()) {

@@ -136,7 +136,7 @@ public class MetaclassInstancesAdapter extends AdapterImpl implements MetaclassI
 

 	/**

 	 * Add a new element to the set of elements corresponding to its metaclass.

-	 * 

+	 *

 	 * @param element

 	 *            the element to add

 	 * @param recursively

@@ -526,7 +526,7 @@ public class MetaclassInstancesAdapter extends AdapterImpl implements MetaclassI
 			listener.modelChanged(msg);

 		}

 	}

-	

+

 	private static TransactionalEditingDomain getTransactionalEditingDomain(

 			final Resource aResource) {

 		TransactionalEditingDomain transactDomain = null;

diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java
index 01fe58ae7..393282c88 100644
--- a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint.

  * 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass

  */

diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java
index 85cf73b28..8b08cbf50 100644
--- a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java
@@ -1,10 +1,10 @@
-/** 

+/**

  * Copyright (c) 2015 Soft-Maint, and 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:

  *    Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass

  *    Thomas Cicognani (Mia-Software) - Bug 475374 - Cannot use SubClassesUtils on an EPackage which is not in the Registry

diff --git a/org.eclipse.modisco.utils.chart.birt.core.tests/.checkstyle b/org.eclipse.modisco.utils.chart.birt.core.tests/.checkstyle
index 782630efa..b9bb3e807 100644
--- a/org.eclipse.modisco.utils.chart.birt.core.tests/.checkstyle
+++ b/org.eclipse.modisco.utils.chart.birt.core.tests/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/AllTestInUIThread.java b/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/AllTestInUIThread.java
index 08d40fb0d..c73bcc287 100644
--- a/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/AllTestInUIThread.java
+++ b/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/AllTestInUIThread.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2012 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2012 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.utils.chart.birt.core.tests;

 

diff --git a/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/Activator.java b/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/Activator.java
index d23464cff..38e954de8 100644
--- a/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/Activator.java
+++ b/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/Activator.java
@@ -3,9 +3,9 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 

 package org.eclipse.modisco.utils.chart.birt.core.tests.internal;

diff --git a/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/BirtGraphHelperTest.java b/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/BirtGraphHelperTest.java
index b1db0d231..97bd4f707 100644
--- a/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/BirtGraphHelperTest.java
+++ b/org.eclipse.modisco.utils.chart.birt.core.tests/src/org/eclipse/modisco/utils/chart/birt/core/tests/internal/BirtGraphHelperTest.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2012 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2012 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.utils.chart.birt.core.tests.internal;

 

@@ -37,9 +37,9 @@ import org.junit.Test;
  */

 public class BirtGraphHelperTest {

 

-	

+

 	/**

-	 * 

+	 *

 	 */

 	private static final int FIVE = 5;

 

@@ -90,7 +90,7 @@ public class BirtGraphHelperTest {
 		}

 		File result = new File(targetFolder.getAbsolutePath() + "/" + fileName + ".png");

 		if (result.exists()) {

-			result.delete();	

+			result.delete();

 		} else {

 			fail("Chart is not generated");

 		}

diff --git a/org.eclipse.modisco.utils.chart.birt.core/.checkstyle b/org.eclipse.modisco.utils.chart.birt.core/.checkstyle
index 782630efa..b9bb3e807 100644
--- a/org.eclipse.modisco.utils.chart.birt.core/.checkstyle
+++ b/org.eclipse.modisco.utils.chart.birt.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/Activator.java b/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/Activator.java
index 74884fc7b..0d521db80 100644
--- a/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/Activator.java
+++ b/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/Activator.java
@@ -3,16 +3,16 @@
  * 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: Guillaume Doux - INRIA - Initial API and implementation

- * 

+ *

  ******************************************************************************/

 package org.eclipse.modisco.utils.chart.birt.core.internal;

 

 import org.osgi.framework.BundleActivator;

 import org.osgi.framework.BundleContext;

 /**

- * 

+ *

  * @author Guillaume Doux

  *

  */

diff --git a/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/GraphHelperException.java b/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/GraphHelperException.java
index 8ba725038..ea8d83ff3 100644
--- a/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/GraphHelperException.java
+++ b/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/GraphHelperException.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

- * Copyright (c) 2012 INRIA. 

- * All rights reserved. This program and the accompanying materials 

- * are made available under the terms of the Eclipse Public License v1.0 

+ * Copyright (c) 2012 INRIA.

+ * 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: 

+ *

+ * Contributors:

  *     Guillaume Doux - INRIA - Initial API and implementation

- *     

+ *

  ******************************************************************************/

 package org.eclipse.modisco.utils.chart.birt.core.internal;

 

diff --git a/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/exported/BirtGraphHelper.java b/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/exported/BirtGraphHelper.java
index a379e793c..644dd4bf1 100644
--- a/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/exported/BirtGraphHelper.java
+++ b/org.eclipse.modisco.utils.chart.birt.core/src/org/eclipse/modisco/utils/chart/birt/core/internal/exported/BirtGraphHelper.java
@@ -63,7 +63,7 @@ import org.eclipse.modisco.utils.chart.metamodel.internal.chart.Serie;
 public final class BirtGraphHelper {

 

 	private static final double UNIT_SPACING = 0.1;

-	

+

 	private static BirtGraphHelper instance;

 

 	private List<ColorDefinition> colors;

@@ -71,7 +71,7 @@ public final class BirtGraphHelper {
 	private static final int CHART_WIDTH = 800;

 

 	private static final int CHART_HEIGHT = 400;

-	

+

 	public List<ColorDefinition> getColors() {

 		return this.colors;

 	}

@@ -102,7 +102,7 @@ public final class BirtGraphHelper {
 		}

 		return BirtGraphHelper.instance;

 	}

-	

+

 	/**

 	 * Create a Birt chart using the chart passed with the birtchart parameter

 	 * Works only with graph having 2 dimensions

@@ -175,7 +175,7 @@ public final class BirtGraphHelper {
 			final ColorDefinition serieColor = getColorForSerie(birtChart.getSeries().indexOf(serie));

 

 			final LineSeries lineSeries = createLineSeries(

-					dataPoints.toArray(new Point[0]), serieColor, 

+					dataPoints.toArray(new Point[0]), serieColor,

 					LineStyle.SOLID_LITERAL, serie.getName());

 			ySeriesDefinition.getSeries().add(lineSeries);

 			final Point[] linearRegression = computeLinearRegression(dataPoints);

@@ -198,7 +198,7 @@ public final class BirtGraphHelper {
 		createYAxis(chart, ord, xAxis, ySeriesDefinition);

 		chartRendering(targetFolder, fileName, chart);

 	}

-	

+

 	private static LineSeries createLineSeries(final Point[] dataPoints,

 			final ColorDefinition serieColor, final LineStyle lineStyle, final String name) {

 		final LineSeries lineSeries = (LineSeries) LineSeriesImpl.create();

@@ -237,7 +237,7 @@ public final class BirtGraphHelper {
 		final PluginSettings pSettings = PluginSettings.instance();

 		final IDeviceRenderer render = pSettings.getDevice("dv.PNG"); //$NON-NLS-1$

 		render.setProperty(IDeviceRenderer.FILE_IDENTIFIER, new File(targetFolder,

-				fileName + ".png")); //$NON-NLS-1$ 

+				fileName + ".png")); //$NON-NLS-1$

 		final Bounds bounds = BoundsImpl.create(0, 0, CHART_WIDTH, CHART_HEIGHT);

 		final Generator generator = Generator.instance();

 		final GeneratedChartState state = generator.build(render.getDisplayServer(), chart, bounds, null,

@@ -255,7 +255,7 @@ public final class BirtGraphHelper {
 	/**

 	 * Computes the linear regression of the given list of points, and returns

 	 * points on the computed line.

-	 * 

+	 *

 	 * @param dataPoints

 	 *            the points to include in the computation

 	 * @return points on the computed approximation line, with the same abscissa

diff --git a/org.eclipse.modisco.utils.chart.metamodel/.checkstyle b/org.eclipse.modisco.utils.chart.metamodel/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.utils.chart.metamodel/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.utils.chart.metamodel/.classpath b/org.eclipse.modisco.utils.chart.metamodel/.classpath
index efdacce14..84853724f 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/.classpath
+++ b/org.eclipse.modisco.utils.chart.metamodel/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.utils.chart.metamodel/build.properties b/org.eclipse.modisco.utils.chart.metamodel/build.properties
index 90dc876dc..da6ce9fb6 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/build.properties
+++ b/org.eclipse.modisco.utils.chart.metamodel/build.properties
@@ -1,8 +1,15 @@
 

-# <copyright>

-# </copyright>

+###############################################################################

+# Copyright (c) 2012, 2018 INRIA and 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

 #

-# $Id$

+# Contributors:

+#    Guillaume Doux - INRIA - Initial API and implementation

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

+###############################################################################

 

 bin.includes = .,\

                model/,\

@@ -11,6 +18,7 @@ bin.includes = .,\
                plugin.properties,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.utils.chart.metamodel/model/chart.genmodel b/org.eclipse.modisco.utils.chart.metamodel/model/chart.genmodel
index c81b237bd..17bbdd738 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/model/chart.genmodel
+++ b/org.eclipse.modisco.utils.chart.metamodel/model/chart.genmodel
@@ -1,7 +1,7 @@
 <?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) 2012 INRIA. All rights reserved. This program and the&#xD;&#xA; * accompanying materials are made available under the terms of the Eclipse&#xD;&#xA; * Public License v1.0 which accompanies this distribution, and is available at&#xD;&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; * &#xD;&#xA; * Contributors: Guillaume Doux - INRIA - Initial API and implementation&#xD;&#xA; * &#xD;&#xA; ******************************************************************************&#xD;&#xA;"

-    modelDirectory="/org.eclipse.modisco.utils.chart.metamodel/src" editDirectory="/org.eclipse.modisco.utils.chart.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="*******************************************************************************&#xD;&#xA; * Copyright (c) 2012, 2018 INRIA and Mia-Software. All rights reserved. This program and the&#xD;&#xA; * accompanying materials are made available under the terms of the Eclipse&#xD;&#xA; * Public License v1.0 which accompanies this distribution, and is available at&#xD;&#xA; * http://www.eclipse.org/legal/epl-v10.html&#xD;&#xA; * &#xD;&#xA; * Contributors: Guillaume Doux - INRIA - Initial API and implementation&#xD;&#xA; * &#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings&#xD;&#xA; ******************************************************************************&#xD;&#xA;"

+    modelDirectory="/org.eclipse.modisco.utils.chart.metamodel/src-gen" editDirectory="/org.eclipse.modisco.utils.chart.edit/src"

     editorDirectory="/org.eclipse.modisco.utils.chart.editor/src" modelPluginID="org.eclipse.modisco.utils.chart.metamodel"

     modelName="chart" testsDirectory="/org.eclipse.modisco.utils.chart.tests/src"

     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" editPluginID="org.eclipse.modisco.utils.chart.edit"

diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Axe.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Axe.java
index 2b9c19b9f..2b9c19b9f 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Axe.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Axe.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Chart.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Chart.java
index 5ddd583db..5ddd583db 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Chart.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Chart.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartFactory.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartFactory.java
index abe8f6640..abe8f6640 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartFactory.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartFactory.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartPackage.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartPackage.java
index 242ffd55b..242ffd55b 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartPackage.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/ChartPackage.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Coordinate.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Coordinate.java
index 18fe332f4..18fe332f4 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Coordinate.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Coordinate.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Point.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Point.java
index d0f99d3b1..d0f99d3b1 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Point.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Point.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Serie.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Serie.java
index eaaab6be5..eaaab6be5 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Serie.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/Serie.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/AxeImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/AxeImpl.java
index 6db501ad5..6db501ad5 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/AxeImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/AxeImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartFactoryImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartFactoryImpl.java
index a0d3fe813..a0d3fe813 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartFactoryImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartFactoryImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartImpl.java
index 486dfd635..486dfd635 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartPackageImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartPackageImpl.java
index 332e69616..332e69616 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartPackageImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/ChartPackageImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/CoordinateImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/CoordinateImpl.java
index 21224a7eb..21224a7eb 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/CoordinateImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/CoordinateImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/PointImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/PointImpl.java
index 3f2483051..3f2483051 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/PointImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/PointImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/SerieImpl.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/SerieImpl.java
index 9a4ce4960..9a4ce4960 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/SerieImpl.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/impl/SerieImpl.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartAdapterFactory.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartAdapterFactory.java
index ac63cc616..ac63cc616 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartAdapterFactory.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartAdapterFactory.java
diff --git a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartSwitch.java b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartSwitch.java
index cf20cbafa..cf20cbafa 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/src/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartSwitch.java
+++ b/org.eclipse.modisco.utils.chart.metamodel/src-gen/org/eclipse/modisco/utils/chart/metamodel/internal/chart/util/ChartSwitch.java
diff --git a/org.eclipse.modisco.utils.core/.checkstyle b/org.eclipse.modisco.utils.core/.checkstyle
index 782630efa..b9bb3e807 100644
--- a/org.eclipse.modisco.utils.core/.checkstyle
+++ b/org.eclipse.modisco.utils.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
   </fileset>
diff --git a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java
index f4c86b55e..c5dcf326c 100644
--- a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java
+++ b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/Activator.java
@@ -1,13 +1,13 @@
 /*******************************************************************************

  * Copyright (c) 2012, 2015 INRIA and 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 

+ * 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:

  *    Guillaume Doux - INRIA - Initial API and implementation

- *    Grégoire Dupé (Mia-Software) - Bug 482715 - NumberFormatException in SystemInfo.computeInfo (180)

+ *    Gr�goire Dup� (Mia-Software) - Bug 482715 - NumberFormatException in SystemInfo.computeInfo (180)

  ******************************************************************************/

 package org.eclipse.modisco.utils.core.internal;

 

diff --git a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java
index 0bd4f1730..05e05b32c 100644
--- a/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java
+++ b/org.eclipse.modisco.utils.core/src/org/eclipse/modisco/utils/core/internal/exported/SystemInfo.java
@@ -8,7 +8,7 @@
  * Contributors:

  *    Nicolas Bros (Mia-Software) - initial API and implementation

  *    Guillaume Doux (INRIA) - refactoring and move to a separate plug-in

- *    Grégoire Dupé (Mia-Software) - Bug 482715 - NumberFormatException in SystemInfo.computeInfo (180)

+ *    Gr�goire Dup� (Mia-Software) - Bug 482715 - NumberFormatException in SystemInfo.computeInfo (180)

  *******************************************************************************/

 package org.eclipse.modisco.utils.core.internal.exported;

 

@@ -135,7 +135,7 @@ public final class SystemInfo {
 		this.nProcessors = bean.getAvailableProcessors();

 

 		this.procName = ""; //$NON-NLS-1$

-		this.procDescription = ""; //$NON-NLS-1$ 

+		this.procDescription = ""; //$NON-NLS-1$

 		this.procCacheSize = ""; //$NON-NLS-1$

 		this.memory = ""; //$NON-NLS-1$

 

@@ -220,7 +220,7 @@ public final class SystemInfo {
 	}

 

 	private static List<String> getInfos(final String name, final String result) {

-		Pattern patternName = Pattern.compile(name + "\\s*:\\s*(.*)"); //$NON-NLS-1$ 

+		Pattern patternName = Pattern.compile(name + "\\s*:\\s*(.*)"); //$NON-NLS-1$

 		Matcher matcher = patternName.matcher(result);

 		List<String> infos = new ArrayList<String>();

 		while (matcher.find()) {

diff --git a/org.eclipse.modisco.workflow.core/.checkstyle b/org.eclipse.modisco.workflow.core/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.workflow.core/.checkstyle
+++ b/org.eclipse.modisco.workflow.core/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowExecution.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowExecution.java
index 2678ae920..94085c566 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowExecution.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowExecution.java
@@ -18,14 +18,14 @@ import org.eclipse.debug.core.ILaunchConfiguration;
 

 /**

  * API to launch a workflow

- * 

+ *

  * @author Nicolas Payneau

  */

 public interface WorkflowExecution {

 

 	/**

 	 * Launch a workflow

-	 * 

+	 *

 	 * @param configuration

 	 *            LaunchConfiguration of MoDiscoWorkflow

 	 * @param mode

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModel.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModel.java
index c8bb92e18..bec323fdd 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModel.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModel.java
@@ -21,14 +21,14 @@ import org.eclipse.modisco.workflow.modiscoworkflow.Workflow;
 

 /**

  * API to define the workflow core

- * 

+ *

  * @author Nicolas Payneau

  */

 public interface WorkflowModel extends Workflow, WorkflowModelNotifier {

 

 	/**

 	 * Retrieve a component at the index specified

-	 * 

+	 *

 	 * @param index

 	 *            Component index

 	 * @return an element

@@ -37,14 +37,14 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Retrieve all components of the workflow

-	 * 

+	 *

 	 * @return an element list

 	 */

 	public List<Element> getAllElements();

 

 	/**

 	 * Add a component in the workflow

-	 * 

+	 *

 	 * @param element

 	 *            Element which represents a launch configuration

 	 */

@@ -52,7 +52,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Change a component in the workflow

-	 * 

+	 *

 	 * @param index

 	 *            Component index

 	 * @param element

@@ -62,7 +62,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * To move an element up in the workflow

-	 * 

+	 *

 	 * @param index

 	 *            index of the element to move up

 	 */

@@ -70,7 +70,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * To move an element down in the workflow

-	 * 

+	 *

 	 * @param index

 	 *            index of the element to move down

 	 */

@@ -78,7 +78,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Delete a component at the index specified

-	 * 

+	 *

 	 * @param index

 	 *            Component index

 	 */

@@ -86,7 +86,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Initialize or load the workflow

-	 * 

+	 *

 	 * @param configuration

 	 *            Launch configuration associated

 	 */

@@ -94,7 +94,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Save the resource

-	 * 

+	 *

 	 * @param configuration

 	 *            Launch configuration associated

 	 */

@@ -102,7 +102,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Move the resource to a new path.

-	 * 

+	 *

 	 * @param path

 	 *            the new Workflow resource path

 	 */

@@ -110,7 +110,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Allows to remove the resource

-	 * 

+	 *

 	 * @param path

 	 *            Workflow resource path

 	 */

@@ -118,7 +118,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Export the workflow

-	 * 

+	 *

 	 * @param outputUri

 	 *            The output location

 	 */

@@ -126,7 +126,7 @@ public interface WorkflowModel extends Workflow, WorkflowModelNotifier {
 

 	/**

 	 * Synchronize resources contained in the workflow

-	 * 

+	 *

 	 * @param elements

 	 *            elements to synchronize, contained in the MoDiscoWorkflow

 	 */

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelListener.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelListener.java
index e228368d3..8353ca425 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelListener.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelListener.java
@@ -17,7 +17,7 @@ public interface WorkflowModelListener {
 

 	/**

 	 * Added a component to the Workflow

-	 * 

+	 *

 	 * @param element

 	 *            Element which represents the component

 	 */

@@ -26,7 +26,7 @@ public interface WorkflowModelListener {
 	/**

 	 * A component was inserted in the Workflow. Called when moving an element

 	 * up or down in the workflow

-	 * 

+	 *

 	 * @param index

 	 *            Component index

 	 * @param element

@@ -36,7 +36,7 @@ public interface WorkflowModelListener {
 

 	/**

 	 * Deleted a component at the specified index

-	 * 

+	 *

 	 * @param index

 	 *            Component index

 	 */

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelNotifier.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelNotifier.java
index a6d1763c3..0f6cf854d 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelNotifier.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/WorkflowModelNotifier.java
@@ -15,14 +15,14 @@ public interface WorkflowModelNotifier {
 

 	/**

 	 * To add a listener to current model as in the pattern Observer

-	 * 

+	 *

 	 * @param listener

 	 */

 	public void addListener(WorkflowModelListener listener);

 

 	/**

 	 * To remove a listener to current model as in the pattern Observer

-	 * 

+	 *

 	 * @param listener

 	 */

 	public void removeListener(WorkflowModelListener listener);

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Activator.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Activator.java
index 57e590555..3b13a1614 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Activator.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Activator.java
@@ -33,7 +33,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -46,7 +46,7 @@ public class Activator extends Plugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -59,7 +59,7 @@ public class Activator extends Plugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Messages.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Messages.java
index a0dbfe0aa..e82ec782c 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Messages.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/Messages.java
@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 /**

  * @author gdupe

- * 

+ *

  */

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.workflow.core.internal.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/MoDiscoWorkflowLaunchConfigurationDelegate.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/MoDiscoWorkflowLaunchConfigurationDelegate.java
index 6b72c1c56..812540f35 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/MoDiscoWorkflowLaunchConfigurationDelegate.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/MoDiscoWorkflowLaunchConfigurationDelegate.java
@@ -23,14 +23,14 @@ import org.eclipse.modisco.workflow.core.internal.engine.EngineFactory;
 /**

  * This class defines the delegate to launch a configuration of MoDiscoWorkflow

  * type.

- * 

+ *

  * @author Nicolas Payneau

  */

 public class MoDiscoWorkflowLaunchConfigurationDelegate implements ILaunchConfigurationDelegate {

 

 	/**

 	 * To launch a MoDiscoWorkflow configuration

-	 * 

+	 *

 	 * @param configuration

 	 *            The configuration of MoDiscoWorkflow

 	 * @param mode

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/Utils.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/Utils.java
index 4db542007..d9baf524f 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/Utils.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/Utils.java
@@ -28,7 +28,7 @@ public final class Utils {
 	/**

 	 * Allows to find the good INSTANCE of LaunchConfiguration corresponding at

 	 * name

-	 * 

+	 *

 	 * @param configName

 	 *            Name of LaunchConfiguration

 	 * @return An INSTANCE of launchConfiguration corresponding at name

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowController.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowController.java
index 6e5857794..a5561f795 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowController.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowController.java
@@ -20,7 +20,7 @@ public interface WorkflowController {
 	/**

 	 * To validate the workflow model, for problems like a recursion in the

 	 * launch sequence

-	 * 

+	 *

 	 * @param workflowModel

 	 *            the model to validate

 	 * @return <code>null</code> if valid, or a message to indicate the error

@@ -31,7 +31,7 @@ public interface WorkflowController {
 	 * Check if the launch configuration identified by its name (rootConfigName)

 	 * could be launched directly or indirectly from the current launch

 	 * configuration (launch)

-	 * 

+	 *

 	 * @param rootConfigName

 	 *            name of a launch configuration to test for recursion

 	 * @param launch

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowControllerImpl.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowControllerImpl.java
index ef412aceb..afb43e980 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowControllerImpl.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowControllerImpl.java
@@ -28,7 +28,7 @@ public class WorkflowControllerImpl implements WorkflowController {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.workflow.WorkflowController#validate(org.eclipse

 	 * .debug.ui.workflow.WorkflowModel)

@@ -65,7 +65,7 @@ public class WorkflowControllerImpl implements WorkflowController {
 

 	/**

 	 * Allows to verify the loop in the Workflow

-	 * 

+	 *

 	 * @param elements

 	 *            All elements contained in Workflow

 	 * @param name

@@ -94,7 +94,7 @@ public class WorkflowControllerImpl implements WorkflowController {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.workflow.WorkflowController#hasPotentialRecursion

 	 * (java.lang.String, org.eclipse.debug.core.ILaunchConfiguration)

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowModelImpl.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowModelImpl.java
index ed9ae9c45..7bc9d5253 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowModelImpl.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/defaultengine/WorkflowModelImpl.java
@@ -101,11 +101,11 @@ public class WorkflowModelImpl extends WorkflowImpl implements WorkflowModel {
 

 	/**

 	 * Deserialize a list of strings (name, index, type) to a list of elements

-	 * 

+	 *

 	 * @param stringList

 	 *            String list source

 	 * @return created element list

-	 * 

+	 *

 	 * @see WorkflowModelImpl#save(ILaunchConfigurationWorkingCopy)

 	 */

 	private static final List<Element> stringListToElementList(final List<String> stringList) {

diff --git a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/engine/EngineFactory.java b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/engine/EngineFactory.java
index 127adcb8f..93d04c330 100644
--- a/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/engine/EngineFactory.java
+++ b/org.eclipse.modisco.workflow.core/src/org/eclipse/modisco/workflow/core/internal/engine/EngineFactory.java
@@ -17,7 +17,7 @@ public interface EngineFactory {
 

 	/**

 	 * The singleton instance of the factory.

-	 * 

+	 *

 	 */

 	public static final EngineFactory INSTANCE = new EngineFactoryImpl();

 

diff --git a/org.eclipse.modisco.workflow.ui/.checkstyle b/org.eclipse.modisco.workflow.ui/.checkstyle
index a3ac56c20..cc930e4a0 100644
--- a/org.eclipse.modisco.workflow.ui/.checkstyle
+++ b/org.eclipse.modisco.workflow.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true">
-  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
   <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
     <file-match-pattern match-pattern="." include-pattern="true"/>
     <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Activator.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Activator.java
index 41da9229b..bb8fe18f9 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Activator.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Activator.java
@@ -33,7 +33,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -46,7 +46,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -59,7 +59,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

@@ -69,7 +69,7 @@ public class Activator extends AbstractUIPlugin {
 	/**

 	 * Returns an image descriptor for the image file at the given plug-in

 	 * relative path

-	 * 

+	 *

 	 * @param path

 	 *            the path

 	 * @return the image descriptor

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/AdditionalButtonsComposite.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/AdditionalButtonsComposite.java
index 8c185b790..2f7dc16ea 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/AdditionalButtonsComposite.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/AdditionalButtonsComposite.java
@@ -32,7 +32,7 @@ public class AdditionalButtonsComposite extends Composite {
 

 	/**

 	 * Class constructor

-	 * 

+	 *

 	 * @param parent

 	 *            The composite parent

 	 * @param style

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Messages.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Messages.java
index 16d46b967..ea995b569 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Messages.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Messages.java
@@ -15,7 +15,7 @@ import org.eclipse.osgi.util.NLS;
 

 /**

  * @author gdupe

- * 

+ *

  */

 public class Messages extends NLS {

 	private static final String BUNDLE_NAME = "org.eclipse.modisco.workflow.ui.internal.messages"; //$NON-NLS-1$

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/MoDiscoWorkflowTabGroup.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/MoDiscoWorkflowTabGroup.java
index a327fb7be..a2feb2af2 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/MoDiscoWorkflowTabGroup.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/MoDiscoWorkflowTabGroup.java
@@ -17,7 +17,7 @@ import org.eclipse.debug.ui.ILaunchConfigurationDialog;
 import org.eclipse.debug.ui.ILaunchConfigurationTab;

 

 /**

- * 

+ *

  * @author Nicolas Payneau

  */

 public class MoDiscoWorkflowTabGroup extends AbstractLaunchConfigurationTabGroup {

@@ -26,7 +26,7 @@ public class MoDiscoWorkflowTabGroup extends AbstractLaunchConfigurationTabGroup
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTabGroup#createTabs(org.eclipse

 	 * .debug.ui.ILaunchConfigurationDialog, java.lang.String)

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Utils.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Utils.java
index f3a70f88c..7f69b9923 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Utils.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/Utils.java
@@ -22,7 +22,7 @@ import org.eclipse.swt.widgets.Shell;
 

 /**

  * Tools box. It's a singleton

- * 

+ *

  * @author Nicolas Payneau

  */

 public final class Utils {

@@ -34,7 +34,7 @@ public final class Utils {
 	/**

 	 * Returns a Point indicating the top left position that the given

 	 * {@link Shell} must take so that it is centered.

-	 * 

+	 *

 	 * @parameter shell shell to center

 	 * @return a point

 	 */

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTab.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTab.java
index f770ffcb6..8ab6e63bc 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTab.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTab.java
@@ -68,7 +68,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#createControl(org.eclipse

 	 * .swt.widgets.Composite)

@@ -194,7 +194,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#setDefaults(org.eclipse.

 	 * debug.core.ILaunchConfigurationWorkingCopy)

@@ -205,7 +205,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#initializeFrom(org.eclipse

 	 * .debug.core.ILaunchConfiguration)

@@ -238,7 +238,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.ILaunchConfigurationTab#performApply(org.eclipse

 	 * .debug.core.ILaunchConfigurationWorkingCopy)

@@ -249,7 +249,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.debug.ui.ILaunchConfigurationTab#getName()

 	 */

 	public String getName() {

@@ -281,7 +281,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see org.eclipse.debug.ui.AbstractLaunchConfigurationTab#getImage()

 	 */

 	@Override

@@ -291,7 +291,7 @@ public class WorkflowTab extends AbstractLaunchConfigurationTab implements Workf
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.debug.ui.AbstractLaunchConfigurationTab#isValid(org.eclipse

 	 * .debug.core.ILaunchConfiguration)

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTableContextMenu.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTableContextMenu.java
index c2c97d53d..e60daae80 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTableContextMenu.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/WorkflowTableContextMenu.java
@@ -31,7 +31,7 @@ public class WorkflowTableContextMenu {
 

 	/**

 	 * Create a pop-up menu on item selected with right click

-	 * 

+	 *

 	 * @param shell

 	 *            Shell of selection

 	 */

@@ -77,7 +77,7 @@ public class WorkflowTableContextMenu {
 	/**

 	 * Create a pop-up menu on right click on table selection (Not item

 	 * selected)

-	 * 

+	 *

 	 * @param shell

 	 */

 	public void createPopupMenuNoSelectionItem(final Shell shell) {

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/LaunchersPage.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/LaunchersPage.java
index 4860ed70c..ecaadbe69 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/LaunchersPage.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/LaunchersPage.java
@@ -68,7 +68,7 @@ public class LaunchersPage extends WizardPage {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets

 	 *      .Composite)

 	 */

@@ -141,7 +141,7 @@ public class LaunchersPage extends WizardPage {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.jface.dialogs.DialogPage#setVisible(boolean)

 	 */

 	@Override

diff --git a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/WizardToSelectLaunchers.java b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/WizardToSelectLaunchers.java
index eaccbf4a0..d95280a9a 100644
--- a/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/WizardToSelectLaunchers.java
+++ b/org.eclipse.modisco.workflow.ui/src/org/eclipse/modisco/workflow/ui/internal/wizard/WizardToSelectLaunchers.java
@@ -32,7 +32,7 @@ public class WizardToSelectLaunchers extends Wizard {
 

 	/**

 	 * Class constructor

-	 * 

+	 *

 	 * @param controllerWorkflow

 	 *            The controller managing the workflow

 	 */

@@ -43,7 +43,7 @@ public class WizardToSelectLaunchers extends Wizard {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.jface.wizard.Wizard#addPages()

 	 */

 	@Override

@@ -54,7 +54,7 @@ public class WizardToSelectLaunchers extends Wizard {
 

 	/**

 	 * {@inheritDoc}

-	 * 

+	 *

 	 * @see org.eclipse.jface.wizard.Wizard#performFinish()

 	 */

 	@Override

diff --git a/org.eclipse.modisco.workflow/.checkstyle b/org.eclipse.modisco.workflow/.checkstyle
new file mode 100644
index 000000000..2638c0b1f
--- /dev/null
+++ b/org.eclipse.modisco.workflow/.checkstyle
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+  <filter name="FilesFromPackage" enabled="true">
+    <filter-data value="src-gen/"/>
+  </filter>
+</fileset-config>
diff --git a/org.eclipse.modisco.workflow/.classpath b/org.eclipse.modisco.workflow/.classpath
index 45f024e85..e5fbd3dd2 100644
--- a/org.eclipse.modisco.workflow/.classpath
+++ b/org.eclipse.modisco.workflow/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="src-gen"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

 	<classpathentry kind="output" path="bin"/>

diff --git a/org.eclipse.modisco.workflow/build.properties b/org.eclipse.modisco.workflow/build.properties
index 6e0865655..7f0549723 100644
--- a/org.eclipse.modisco.workflow/build.properties
+++ b/org.eclipse.modisco.workflow/build.properties
@@ -1,5 +1,5 @@
 ###############################################################################

-# Copyright (c) 2011 Mia-Software.

+# Copyright (c) 2011, 2018 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

@@ -9,7 +9,7 @@
 #    Nicolas Payneau (Mia-Software) - initial API and implementation

 #    Nicolas Bros (Mia-Software) - Bug 337402 - [Discovery Workflow] refactoring

 ###############################################################################

-# Copyright (c) 2011 Mia-Software.

+# Copyright (c) 2011, 2018 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

@@ -18,6 +18,7 @@
 # Contributors:

 #  Nicolas Payneau (Mia-Software) - initial API and implementation

 #  Nicolas Bros (Mia-Software) - refactored

+#	 Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings

 # 

 

 bin.includes = .,\

@@ -27,6 +28,7 @@ bin.includes = .,\
                OSGI-INF/,\

                about.html

 jars.compile.order = .

-source.. = src/

+source.. = src/,\

+           src-gen/

 output.. = bin/

 src.includes = about.html

diff --git a/org.eclipse.modisco.workflow/model/MoDiscoWorkflow.genmodel b/org.eclipse.modisco.workflow/model/MoDiscoWorkflow.genmodel
index 6e52eac62..763f03456 100644
--- a/org.eclipse.modisco.workflow/model/MoDiscoWorkflow.genmodel
+++ b/org.eclipse.modisco.workflow/model/MoDiscoWorkflow.genmodel
@@ -1,8 +1,8 @@
 <?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="Copyright (c) 2009, 2011 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;   Nicolas Payneau (Mia-Software) - initial API and implementation&#xD;&#xA;   Nicolas Bros (Mia-Software) - Bug 337402 - [Discovery Workflow] refactoring"

-    modelDirectory="/org.eclipse.modisco.workflow/src" editDirectory="/org.eclipse.modisco.workflow.edit/src"

+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" copyrightText="Copyright (c) 2009, 2018 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;   Nicolas Payneau (Mia-Software) - initial API and implementation&#xD;&#xA;   Nicolas Bros (Mia-Software) - Bug 337402 - [Discovery Workflow] refactoring&#xD;&#xA;    Fabien Giquel (Mia-Software) - Bug 533168 - (releng) OutOfMemory during quality postprocessing because large number of checkstyle warnings"

+    modelDirectory="/org.eclipse.modisco.workflow/src-gen" editDirectory="/org.eclipse.modisco.workflow.edit/src"

     editorDirectory="/org.eclipse.modisco.workflow.editor/src" modelPluginID="org.eclipse.modisco.workflow"

     modelName="MoDiscoWorkflow" nonNLSMarkers="true" importerID="org.eclipse.emf.importer.ecore"

     complianceLevel="5.0" copyrightFields="false" editPluginID="org.eclipse.modisco.workflow.edit"

diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Direction.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Direction.java
index 6a0b026ae..6a0b026ae 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Direction.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Direction.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Element.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Element.java
index bb348e41f..bb348e41f 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Element.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Element.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/ExportInfos.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/ExportInfos.java
index 21c17970e..21c17970e 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/ExportInfos.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/ExportInfos.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java
index 44c066192..44c066192 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowFactory.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java
index b90a3f215..b90a3f215 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/ModiscoworkflowPackage.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Work.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Work.java
index ce97667cd..ce97667cd 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Work.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Work.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameter.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameter.java
index 350e877b0..350e877b0 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameter.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameter.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java
index 1c8a2190d..1c8a2190d 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterBooleanValue.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java
index feb1d8978..feb1d8978 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterIntegerValue.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java
index 0b801b685..0b801b685 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterMapValue.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java
index 81f175d44..81f175d44 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringListValue.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java
index 97e77a64a..97e77a64a 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterStringValue.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterValue.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterValue.java
index 922738cc0..922738cc0 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterValue.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/WorkParameterValue.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Workflow.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Workflow.java
index 79a6f81b1..79a6f81b1 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/Workflow.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/Workflow.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ElementImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ElementImpl.java
index 73647da9c..73647da9c 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ElementImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ElementImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java
index 2737d41a6..2737d41a6 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ExportInfosImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java
index b17f7e982..b17f7e982 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowFactoryImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java
index 62e3e8e71..62e3e8e71 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/ModiscoworkflowPackageImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkImpl.java
index 3a87105f8..3a87105f8 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java
index 6e03948c4..6e03948c4 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterBooleanValueImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java
index 72b588018..72b588018 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterEntryValueImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java
index 14be21a6f..14be21a6f 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java
index 2b1facb72..2b1facb72 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterIntegerValueImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java
index d2d04cc47..d2d04cc47 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterMapValueImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java
index eefbe832a..eefbe832a 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringListValueImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java
index 7ad6316c1..7ad6316c1 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkParameterStringValueImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java
index a741775c7..a741775c7 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/impl/WorkflowImpl.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java
index ac71fcd27..ac71fcd27 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowAdapterFactory.java
diff --git a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java
index d1a77f9a0..d1a77f9a0 100644
--- a/org.eclipse.modisco.workflow/src/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java
+++ b/org.eclipse.modisco.workflow/src-gen/org/eclipse/modisco/workflow/modiscoworkflow/util/ModiscoworkflowSwitch.java
diff --git a/org.eclipse.modisco.xml.discoverer.tests/.checkstyle b/org.eclipse.modisco.xml.discoverer.tests/.checkstyle
new file mode 100644
index 000000000..cc930e4a0
--- /dev/null
+++ b/org.eclipse.modisco.xml.discoverer.tests/.checkstyle
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true">
+  <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
+  <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+    <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+  </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Activator.java b/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Activator.java
index ed34a6ff0..02872830e 100644
--- a/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Activator.java
+++ b/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test001.java b/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test001.java
index 56fae07f9..7d288c9f2 100644
--- a/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test001.java
+++ b/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test001.java
@@ -4,7 +4,7 @@
  * 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:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - refactored tests for new XML Discoverer

diff --git a/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test002.java b/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test002.java
index 07216f5df..80de26447 100644
--- a/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test002.java
+++ b/org.eclipse.modisco.xml.discoverer.tests/src/org/eclipse/modisco/xml/discoverer/tests/Test002.java
@@ -4,7 +4,7 @@
  * 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:

  *    Fabien Giquel (Mia-Software) - initial API and implementation

  *    Nicolas Bros (Mia-Software) - refactored tests for new XML Discoverer

diff --git a/org.eclipse.modisco.xml.discoverer.ui/.checkstyle b/org.eclipse.modisco.xml.discoverer.ui/.checkstyle
index 4100432d3..2d0d94720 100644
--- a/org.eclipse.modisco.xml.discoverer.ui/.checkstyle
+++ b/org.eclipse.modisco.xml.discoverer.ui/.checkstyle
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
-  <local-check-config name="Modisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description="">
+  <local-check-config name="Modisco" location="/org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description="">
     <additional-data name="protect-config-file" value="false"/>
   </local-check-config>
   <fileset name="all" enabled="true" check-config-name="Modisco" local="true">
diff --git a/org.eclipse.modisco.xml.discoverer.ui/src/org/eclipse/modisco/xml/discoverer/ui/Activator.java b/org.eclipse.modisco.xml.discoverer.ui/src/org/eclipse/modisco/xml/discoverer/ui/Activator.java
index 728582771..a7b9f1c27 100644
--- a/org.eclipse.modisco.xml.discoverer.ui/src/org/eclipse/modisco/xml/discoverer/ui/Activator.java
+++ b/org.eclipse.modisco.xml.discoverer.ui/src/org/eclipse/modisco/xml/discoverer/ui/Activator.java
@@ -32,7 +32,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext

 	 * )

@@ -45,7 +45,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/*

 	 * (non-Javadoc)

-	 * 

+	 *

 	 * @see

 	 * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext

 	 * )

@@ -58,7 +58,7 @@ public class Activator extends AbstractUIPlugin {
 

 	/**

 	 * Returns the shared instance

-	 * 

+	 *

 	 * @return the shared instance

 	 */

 	public static Activator getDefault() {

diff --git a/org.eclipse.modisco.xml.discoverer/.checkstyle b/org.eclipse.modisco.xml.discoverer/.checkstyle
index a275c803f..ccd57eb46 100644
--- a/org.eclipse.modisco.xml.discoverer/.checkstyle
+++ b/org.eclipse.modisco.xml.discoverer/.checkstyle
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
  <fileset-config file-format-version="1.2.0" simple-config="true">
-   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+   <local-check-config name="MoDisco" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet-6.2.checkstyle" type="project" description=""/>
    <fileset name="all" enabled="true" check-config-name="MoDisco" local="true">
      <file-match-pattern match-pattern="." include-pattern="true"/>
      <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
diff --git a/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XmlActivator.java b/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XmlActivator.java
index 8ef081281..40992b288 100644
--- a/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XmlActivator.java
+++ b/org.eclipse.modisco.xml.discoverer/src/org/eclipse/modisco/xml/discoverer/internal/XmlActivator.java
@@ -4,9 +4,9 @@
  * 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:

- * 

+ *

  *     Fabien Giquel (Mia-Software) - initial API and implementation

  **********************************************************************************/

 package org.eclipse.modisco.xml.discoverer.internal;

@@ -24,7 +24,7 @@ public class XmlActivator extends Plugin {
 

 	// The shared instance

 	private static XmlActivator plugin;

-	

+

 	/**

 	 * The constructor

 	 */